From d6a599dbc9d824a462b2b206316e102bf8136446 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 11 Jul 2012 13:45:28 +0200
Subject: Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644
 (http://svn.webkit.org/repository/webkit/trunk@122325)

New snapshot that should work with the latest Qt build system changes
---
 WebKit.pro | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'WebKit.pro')

diff --git a/WebKit.pro b/WebKit.pro
index 9b4007b51..8d4cbbb56 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -5,17 +5,17 @@
 # See 'Tools/qmake/README' for an overview of the build system
 # -------------------------------------------------------------------
 
+haveQt(4) {
+    QMAKEPATH = $$(QMAKEPATH)
+    isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
+        error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
+        # Otherwise we won't pick up the feature prf files needed for the build
+    }
+}
+
 TEMPLATE = subdirs
 CONFIG += ordered
 
-load(features)
-
-QMAKEPATH = $$(QMAKEPATH)
-isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
-    error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
-    # Otherwise we won't pick up the feature prf files needed for the build
-}
-
 WTF.file = Source/WTF/WTF.pro
 WTF.makefile = Makefile.WTF
 SUBDIRS += WTF
@@ -30,18 +30,18 @@ WebCore.file = Source/WebCore/WebCore.pro
 WebCore.makefile = Makefile.WebCore
 SUBDIRS += WebCore
 
-!no_webkit2 {
-    webkit2.file = Source/WebKit2/WebKit2.pro
-    webkit2.makefile = Makefile.WebKit2
-    SUBDIRS += webkit2
-}
-
 !no_webkit1 {
     webkit1.file = Source/WebKit/WebKit1.pro
     webkit1.makefile = Makefile.WebKit1
     SUBDIRS += webkit1
 }
 
+!no_webkit2 {
+    webkit2.file = Source/WebKit2/WebKit2.pro
+    webkit2.makefile = Makefile.WebKit2
+    SUBDIRS += webkit2
+}
+
 QtWebKit.file = Source/QtWebKit.pro
 QtWebKit.makefile = Makefile.QtWebKit
 SUBDIRS += QtWebKit
-- 
cgit v1.2.3