[Qt] Fix QML import installation with newer Qt

Reviewed by Tor Arne Vestbø.

The import path has been separated between QML1 and QML2. Use
QT_INSTALL_QML if it's available.

* declarative/experimental/experimental.pri:
* declarative/public.pri:

Canonical link: https://commits.webkit.org/121854@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/qt/ChangeLog

@@ -1,3 +1,15 @@
+2012-11-30  Simon Hausmann  <simon.hausmann@digia.com>
+
+        [Qt] Fix QML import installation with newer Qt
+
+        Reviewed by Tor Arne Vestbø.
+
+        The import path has been separated between QML1 and QML2. Use
+        QT_INSTALL_QML if it's available.
+
+        * declarative/experimental/experimental.pri:
+        * declarative/public.pri:
+
 2012-11-30  Simon Hausmann  <simon.hausmann@digia.com>
 
         Prospective build fix for --minimal build.

Source/WebKit/qt/declarative/experimental/experimental.pri

@@ -37,11 +37,16 @@ DEFINES += HAVE_WEBKIT2
 
 WEBKIT += wtf javascriptcore webkit2
 
-target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
+# The fallback to QT_INSTALL_IMPORTS can be removed once we
+# depend on Qt 5 RC1.
+importPath = $$[QT_INSTALL_QML]
+isEmpty(importPath): importPath = $$[QT_INSTALL_IMPORTS]
+
+target.path = $${importPath}/$${TARGET.module_name}
 
 
 qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
+qmldir.path +=  $${importPath}/$${TARGET.module_name}
 
 INSTALLS += target qmldir
 

Source/WebKit/qt/declarative/public.pri

@@ -40,10 +40,15 @@ build?(webkit2): {
     QT += network
 }
 
-target.path = $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
+# The fallback to QT_INSTALL_IMPORTS can be removed once we
+# depend on Qt 5 RC1.
+importPath = $$[QT_INSTALL_QML]
+isEmpty(importPath): importPath = $$[QT_INSTALL_IMPORTS]
+
+target.path = $${importPath}/$${TARGET.module_name}
 
 
 qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$${TARGET.module_name}
+qmldir.path +=  $${importPath}/$${TARGET.module_name}
 
 INSTALLS += target qmldir