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: http://lists.qt-project.org/pipermail/development/2012-October/007136.html
Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

5 files changed, 14 insertions, 8 deletions

diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 03ef88221e..a452592c9b 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -10,9 +10,9 @@ for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
 OTHER_FILES += $$fq_qml_files
 
 qml1_target: \
-    instbase = $$[QT_INSTALL_IMPORTS]/QtDeclarative
-else: \
     instbase = $$[QT_INSTALL_IMPORTS]
+else: \
+    instbase = $$[QT_INSTALL_QML]
 
 exists($$[QT_HOST_PREFIX]/.qmake.cache) {
     # These bizarre rules copy the files to the qtbase build directory
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index b938bf493e..c700dda41f 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -17,17 +17,19 @@ isEmpty(CXX_MODULE) {
     TARGET = declarative_$${TARGET}
 }
 isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name)
-DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH
 
 QMLTYPEFILE = $$_PRO_FILE_PWD_/plugins.qmltypes
 exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE
 
 # Install rules
 
-qml1_target: \
-    instbase = $$[QT_INSTALL_IMPORTS]/QtDeclarative
-else: \
+qml1_target {
+    DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH
     instbase = $$[QT_INSTALL_IMPORTS]
+} else {
+    DESTDIR = $$eval(QT.$${CXX_MODULE}.qml)/$$TARGETPATH
+    instbase = $$[QT_INSTALL_QML]
+}
 
 target.path = $$instbase/$$TARGETPATH
 INSTALLS += target
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 305ff1cb81..5d250ea346 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -21,6 +21,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
          QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS]
          QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS]
          QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS]
+         QT_MODULE_QML_BASE = $$[QT_INSTALL_QML]
          include($$mod)
       }
    }
@@ -29,6 +30,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
    unset(QT_MODULE_PLUGIN_BASE)
    unset(QT_MODULE_BIN_BASE)
    unset(QT_MODULE_IMPORT_BASE)
+   unset(QT_MODULE_QML_BASE)
 }
 
 load(qt_functions)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 0d004f29c8..85b89d568c 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -81,7 +81,8 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
         "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \
         "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]" \
         "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \
-        "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE$$MODULE_IMPORT_SUFFIX" \
+        "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE" \
+        "QT.$${MODULE}.qml = \$\$QT_MODULE_QML_BASE" \
         "QT.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \
         $$module_privdep \
         $$module_build_type \
diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf
index 33ceff1cd5..cd3aed9e0f 100644
--- a/mkspecs/features/qt_module_fwdpri.prf
+++ b/mkspecs/features/qt_module_fwdpri.prf
@@ -52,6 +52,7 @@
         "QT_MODULE_BIN_BASE = $$MODULE_BASE_OUTDIR/bin" \
         "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_OUTDIR/include" \
         "QT_MODULE_IMPORT_BASE = $$MODULE_BASE_OUTDIR/imports" \
+        "QT_MODULE_QML_BASE = $$MODULE_BASE_OUTDIR/qml" \
         "QT_MODULE_LIB_BASE = $$MODULE_BASE_OUTDIR/lib" \
         "QT_MODULE_PLUGIN_BASE = $$MODULE_BASE_OUTDIR/plugins" \
         $$module_rpathlink \
@@ -69,7 +70,7 @@
     include($$MODULE_FWD_PRI)
     for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
                     name depends private_depends module_config CONFIG DEFINES sources \
-                    includes private_includes bins libs plugins imports \
+                    includes private_includes bins libs plugins imports qml \
             )):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient)
     cache(QT_CONFIG, transient)