[Qt] Don't try to build WTR twice

Reviewed by Csaba Osztrogonác.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 526ca4f..9f90448 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Don't try to build WTR twice
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Tools.pro:
+
 2012-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r121821.

diff --git a/Tools/Tools.pro b/Tools/Tools.pro
index 3049306..c76cf7a 100644 (file)
--- a/Tools/Tools.pro
+++ b/Tools/Tools.pro
@@ -14,12 +14,11 @@ CONFIG += ordered
 }
 
 !no_webkit2 {
-    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-    SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
-    SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
-
     # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
     !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+
+    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
+    SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
 }
 
 # FIXME: with Qt 5 the test plugin cause some trouble during layout tests.