Title: [121230] trunk/Source/WebKit
- Revision
- 121230
- Author
- [email protected]
- Date
- 2012-06-25 22:32:44 -0700 (Mon, 25 Jun 2012)
Log Message
Unreviewed build fix: Don't do QT += widgets with Qt 4
Source/WebKit:
* WebKit1.pro: This is already done in WebKit1.pri.
Source/WebKit/qt:
* examples/platformplugin/platformplugin.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (121229 => 121230)
--- trunk/Source/WebKit/ChangeLog 2012-06-26 05:23:57 UTC (rev 121229)
+++ trunk/Source/WebKit/ChangeLog 2012-06-26 05:32:44 UTC (rev 121230)
@@ -1,5 +1,11 @@
2012-06-25 Simon Hausmann <[email protected]>
+ Unreviewed build fix: Don't do QT += widgets with Qt 4
+
+ * WebKit1.pro: This is already done in WebKit1.pri.
+
+2012-06-25 Simon Hausmann <[email protected]>
+
[Qt] Make it possible to build WebKit without QtWidgets
https://bugs.webkit.org/show_bug.cgi?id=78109
Modified: trunk/Source/WebKit/WebKit1.pro (121229 => 121230)
--- trunk/Source/WebKit/WebKit1.pro 2012-06-26 05:23:57 UTC (rev 121229)
+++ trunk/Source/WebKit/WebKit1.pro 2012-06-26 05:32:44 UTC (rev 121230)
@@ -12,7 +12,7 @@
include(WebKit1.pri)
WEBKIT += wtf _javascript_core webcore
-QT += gui widgets
+QT += gui
CONFIG += staticlib
Modified: trunk/Source/WebKit/qt/ChangeLog (121229 => 121230)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-26 05:23:57 UTC (rev 121229)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-26 05:32:44 UTC (rev 121230)
@@ -1,3 +1,9 @@
+2012-06-25 Simon Hausmann <[email protected]>
+
+ Unreviewed build fix: Don't do QT += widgets with Qt 4
+
+ * examples/platformplugin/platformplugin.pro:
+
2012-06-23 Sheriff Bot <[email protected]>
Unreviewed, rolling out r121058.
Modified: trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro (121229 => 121230)
--- trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2012-06-26 05:23:57 UTC (rev 121229)
+++ trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2012-06-26 05:32:44 UTC (rev 121230)
@@ -1,7 +1,8 @@
TEMPLATE = lib
TARGET = platformplugin
-QT += core gui widgets
+QT += core gui
+haveQt(5): QT += widgets
CONFIG += plugin
## load mobilityconfig if mobility is available
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
