[Qt] Make sure QtWebKit correctly compiles when building WebKit2 with Qt5.
authoralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Aug 2011 14:33:34 +0000 (14:33 +0000)
committeralexis.menard@openbossa.org <alexis.menard@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Aug 2011 14:33:34 +0000 (14:33 +0000)
In order to build correctly the QtQuick1 plugin we need to explicitly
link to the new library added in Qt5 "qtquick1".

Reviewed by Simon Hausmann.

* declarative/declarative.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@92960 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/declarative.pro

index 68f2e70..cc7b5bb 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-12  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Make sure QtWebKit correctly compiles when building WebKit2 with Qt5.
+
+        In order to build correctly the QtQuick1 plugin we need to explicitly
+        link to the new library added in Qt5 "qtquick1".
+
+        Reviewed by Simon Hausmann.
+
+        * declarative/declarative.pro:
+
 2011-08-11  Andrew Wason  <rectalogic@rectalogic.com>
 
         REGRESSION: Qt JavaScript bridge signal connection fails
index 3552a6c..6a3e24b 100644 (file)
@@ -41,6 +41,10 @@ include(../../../WebKit.pri)
 
 QT += declarative
 
+contains(QT_CONFIG, qtquick1): {
+    QT += qtquick1
+}
+
 !CONFIG(standalone_package) {
     linux-* {
         # From Creator's src/rpath.pri: