diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-15 09:08:00 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-15 21:41:43 +0100 |
| commit | 1ea1e0d7f3c1c600b024e4862e69208d2f3232c7 (patch) | |
| tree | c5b1c55cdf879078d6073d8e87c0e56da7abcf1a /src/corelib/global/qlibraryinfo.cpp | |
| parent | dfb4b7856a82a72934211d9a1a44626777570d30 (diff) | |
Document QLibraryInfo::Qml2ImportsPath as deprecated
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>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 3a515cb9ba..3b831e71af 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -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. |