[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e63e471f37bc231d8cdba9de1520aa25dde3ae09
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 16:16:19 2010 +0000

    2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Turn on building WTR
            https://bugs.webkit.org/show_bug.cgi?id=47349
    
            * DerivedSources.pro:
            * WebKit.pro:
    2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt] Turn on building WTR
            https://bugs.webkit.org/show_bug.cgi?id=47349
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1e2ceb7..e1902e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Turn on building WTR
+        https://bugs.webkit.org/show_bug.cgi?id=47349
+
+        * DerivedSources.pro:
+        * WebKit.pro:
+
 2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>, Andras Becsi  <abecsi at webkit.org>, Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 76cb37e..ef88632 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -8,9 +8,7 @@ SUBDIRS += \
 
 webkit2 {
     SUBDIRS += WebKit2/DerivedSources.pro
-
-    # Uncomment when WTR is ready upstream
-    #SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
+    SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
 }
 
 for(subpro, SUBDIRS) {
diff --git a/WebKit.pro b/WebKit.pro
index 595fde5..069e1f2 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -33,8 +33,7 @@ build-qtscript {
 webkit2 {
     exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
     exists($$PWD/WebKitTools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += WebKitTools/MiniBrowser/qt/MiniBrowser.pro
-    # Turn it on after the build has been stabilized.
-    #exists($$PWD/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro): SUBDIRS += WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
+    exists($$PWD/WebKitTools/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += WebKitTools/WebKitTestRunner/WebKitTestRunner.pro
 }
 
 symbian {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d1f427b..0e36eff 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
 
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] Turn on building WTR
+        https://bugs.webkit.org/show_bug.cgi?id=47349
+
+        * Scripts/webkitdirs.pm:
+
+2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
+
         Reviewed by Andreas Kling.
 
         [Qt] TestController needs its platform dependent methods
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 48dadcb..f8b5035 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1530,9 +1530,7 @@ sub buildQMakeProject($@)
     my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
     if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
         push @subdirs, "WebKit2";
-
-        # Uncomment when WTR is ready upstream
-        #push @subdirs, "WebKitTools/WebKitTestRunner";
+        push @subdirs, "WebKitTools/WebKitTestRunner";
     }
 
     for my $subdir (@subdirs) {

-- 
WebKit Debian packaging