diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 13d3a879c7..a756577311 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -257,6 +257,15 @@ QLibraryInfo::isDebugBuild() #endif // QT_BOOTSTRAPPED +/* + * To add a new entry in QLibrary::LibraryLocation, add it to the enum above the bootstrapped values and: + * - add its relative path in the qtConfEntries[] array below + * (the key is what appears in a qt.conf file) + * - add a property name in qmake/property.cpp propList[] array + * (it's used with qmake -query) + * - add to qt_config.prf, qt_module.prf, qt_module_fwdpri.prf + */ + static const struct { char key[14], value[13]; } qtConfEntries[] = { @@ -267,6 +276,7 @@ static const struct { { "Binaries", "bin" }, { "Plugins", "plugins" }, // should be ${ArchData}/plugins { "Imports", "imports" }, // should be ${ArchData}/imports + { "Qml2Imports", "qml" }, // should be ${ArchData}/qml { "ArchData", "." }, { "Data", "." }, { "Translations", "translations" }, // should be ${Data}/translations @@ -444,7 +454,8 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) \value LibrariesPath The location of installed libraries. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. - \value ImportsPath The location of installed QML extensions to import. + \value ImportsPath The location of installed QML extensions to import (QML 1.x). + \value Qml2ImportsPath The location of installed QML extensions to import (QML 2.x). \value ArchDataPath The location of general architecture-dependent Qt data. \value DataPath The location of general architecture-independent Qt data. \value TranslationsPath The location of translation information for Qt strings. diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 7f035194ef..5d6e42965f 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -70,12 +70,14 @@ public: BinariesPath, PluginsPath, ImportsPath, + Qml2ImportsPath, ArchDataPath, DataPath, TranslationsPath, ExamplesPath, TestsPath, // Insert new values above this line + // Please read the comments in qlibraryinfo.cpp before adding #ifdef QT_BOOTSTRAPPED // These are not subject to binary compatibility constraints SysrootPath, |