Title: [136242] trunk/Source/WebKit/qt
- Revision
- 136242
- Author
- hausm...@webkit.org
- Date
- 2012-11-30 07:48:35 -0800 (Fri, 30 Nov 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (136241 => 136242)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:32:36 UTC (rev 136241)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:48:35 UTC (rev 136242)
@@ -1,5 +1,17 @@
2012-11-30 Simon Hausmann <simon.hausm...@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.hausm...@digia.com>
+
Prospective build fix for --minimal build.
* WebCoreSupport/QWebPageAdapter.cpp:
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (136241 => 136242)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-11-30 15:32:36 UTC (rev 136241)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-11-30 15:48:35 UTC (rev 136242)
@@ -37,11 +37,16 @@
WEBKIT += wtf _javascript_core 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
Modified: trunk/Source/WebKit/qt/declarative/public.pri (136241 => 136242)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-11-30 15:32:36 UTC (rev 136241)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-11-30 15:48:35 UTC (rev 136242)
@@ -40,10 +40,15 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
