1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLibraryInfo: Rename Qml2ImportsPath to QmlImportsPath

Browse Source 
The "2" is meaningless. We retain the old name as alias for source
compatibility, but we don't document it anymore.

Task-number: QTBUG-85064
Change-Id: Id10d58f6d39a0faaec042304b374ae6b23469362
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Ulf Hermann 2021-02-05 18:08:46 +01:00
parent 8aff901f70
commit 4e5d0cf5e5
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/property.cpp
View File

@ -54,7 +54,7 @@ static const struct {
{ "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false }, { "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false },
{ "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false }, { "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false },
{ "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false }, { "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false },
{ "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false, false }, { "QT_INSTALL_QML", QLibraryInfo::QmlImportsPath, false, false },
{ "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false }, { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false },
{ "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false }, { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false },
{ "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false, false }, { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false, false },

2
src/corelib/global/qlibraryinfo.cpp
View File

@ -860,7 +860,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
\value LibraryExecutablesPath The path to installed executables required by libraries at runtime. \value LibraryExecutablesPath The path to installed executables required by libraries at runtime.
\value BinariesPath The path to installed Qt binaries (tools and applications). \value BinariesPath The path to installed Qt binaries (tools and applications).
\value PluginsPath The path to installed Qt plugins. \value PluginsPath The path to installed Qt plugins.
\value Qml2ImportsPath The path to installed QML extensions to import (QML 2.x). \value QmlImportsPath The path to installed QML extensions to import.
\value ArchDataPath The path to general architecture-dependent Qt data. \value ArchDataPath The path to general architecture-dependent Qt data.
\value DataPath The path to general architecture-independent Qt data. \value DataPath The path to general architecture-independent Qt data.
\value TranslationsPath The path to translation information for Qt strings. \value TranslationsPath The path to translation information for Qt strings.

3
src/corelib/global/qlibraryinfo.h
View File

@ -65,7 +65,8 @@ public:
LibraryExecutablesPath, LibraryExecutablesPath,
BinariesPath, BinariesPath,
PluginsPath, PluginsPath,
Qml2ImportsPath, QmlImportsPath,
Qml2ImportsPath = QmlImportsPath,
ArchDataPath, ArchDataPath,
DataPath, DataPath,
TranslationsPath, TranslationsPath,