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:

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

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 93cfa7d..b2e2ca4 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2012-06-25  Simon Hausmann  <simon.hausmann@nokia.com>
 
+        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  <simon.hausmann@nokia.com>
+
         [Qt] Make it possible to build WebKit without QtWidgets
         https://bugs.webkit.org/show_bug.cgi?id=78109
 

diff --git a/Source/WebKit/WebKit1.pro b/Source/WebKit/WebKit1.pro
index 2e99bb4..fce809c 100644 (file)
--- a/Source/WebKit/WebKit1.pro
+++ b/Source/WebKit/WebKit1.pro
@@ -12,7 +12,7 @@ load(features)
 include(WebKit1.pri)
 
 WEBKIT += wtf javascriptcore webcore
-QT += gui widgets
+QT += gui
 
 CONFIG += staticlib
 

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index d8a1e5c..c26181c 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-25  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Unreviewed build fix: Don't do QT += widgets with Qt 4
+
+        * examples/platformplugin/platformplugin.pro:
+
 2012-06-23  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r121058.

diff --git a/Source/WebKit/qt/examples/platformplugin/platformplugin.pro b/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
index fc533d3..b5da71c 100644 (file)
--- a/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
+++ b/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
@@ -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