Title: [92960] trunk/Source/WebKit/qt
- Revision
- 92960
- Author
- [email protected]
- Date
- 2011-08-12 07:33:34 -0700 (Fri, 12 Aug 2011)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (92959 => 92960)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-12 14:05:53 UTC (rev 92959)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-12 14:33:34 UTC (rev 92960)
@@ -1,3 +1,14 @@
+2011-08-12 Alexis Menard <[email protected]>
+
+ [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 <[email protected]>
REGRESSION: Qt _javascript_ bridge signal connection fails
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (92959 => 92960)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2011-08-12 14:05:53 UTC (rev 92959)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2011-08-12 14:33:34 UTC (rev 92960)
@@ -41,6 +41,10 @@
QT += declarative
+contains(QT_CONFIG, qtquick1): {
+ QT += qtquick1
+}
+
!CONFIG(standalone_package) {
linux-* {
# From Creator's src/rpath.pri:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
