path: root/qmake/property.cpp
diff options
authorThiago Macieira <>2012-10-15 13:23:13 -0700
committerThe Qt Project <>2012-11-19 15:25:54 +0100
commitdf3631045c35aaed0b9de4ae5e643c8019972d13 (patch)
tree9e4c1bc3489d7e88ccc164f6d6c76142bcad483e /qmake/property.cpp
parent36270e45058b84c2fc3cb9683278983eedea3a1b (diff)
Add a new location for QML 2.x imports
This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <> Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'qmake/property.cpp')
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 35f0ba9e7b..8379b2a58c 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -65,6 +65,7 @@ static const struct {
{ "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false },
{ "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false },
{ "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
+ { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
{ "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
{ "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
{ "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },