[Qt] Move Webkit1 before WebKit2 in the build order

Reviewed by Csaba Osztrogonác.

* WebKit.pro:

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

diff --git a/ChangeLog b/ChangeLog
index d3f79ee..b5385ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-05  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Move Webkit1 before WebKit2 in the build order
+
+        Reviewed by Csaba Osztrogonác.
+
+        * WebKit.pro:
+
 2012-07-05  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [CMAKE] Unreviewd typo fix after r121857

diff --git a/WebKit.pro b/WebKit.pro
index 2b2aff6..6cc7e6d 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -28,18 +28,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