AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document QLibraryInfo::Qml2ImportsPath as deprecated

Browse Source 
Also, add a TODO for migrating to QmlImportsPath in qt.conf.

Task-number: QTBUG-98335
Change-Id: I3c321c99c6286ba64eef643876f5b56d5a8ca695
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ulf Hermann 2021-11-15 09:08:00 +01:00
parent dfb4b7856a
commit 1ea1e0d7f3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,11 @@ void QLibraryInfoPrivate::keyAndDefault(QLibraryInfo::LibraryPath loc, QString *
#endif
"Binaries", "bin",
"Plugins", "plugins", // should be ${ArchData}/plugins
// TODO: Find a way to rename this to QmlImports
// without breaking compatibility with old qt.conf files.
"Qml2Imports", "qml", // should be ${ArchData}/qml
"ArchData", ".",
"Data", ".",
"Translations", "translations", // should be ${Data}/translations
@ -670,7 +674,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
\value BinariesPath The path to installed Qt binaries (tools and applications).
\value PluginsPath The path to installed Qt plugins.
\value QmlImportsPath The path to installed QML extensions to import.
\value Qml2ImportsPath The path to installed QML extensions to import.
\value Qml2ImportsPath This value is deprecated. Use QmlImportsPath instead.
\value ArchDataPath The path to general architecture-dependent Qt data.
\value DataPath The path to general architecture-independent Qt data.
\value TranslationsPath The path to translation information for Qt strings.