2010-10-07 Sheriff Bot <webkit.review.bot@gmail.com>
authorkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Oct 2010 17:56:58 +0000 (17:56 +0000)
committerkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Oct 2010 17:56:58 +0000 (17:56 +0000)
        Unreviewed, rolling out r69315.
        http://trac.webkit.org/changeset/69315
        https://bugs.webkit.org/show_bug.cgi?id=47363

        Forgot to add the new files (Requested by kbalazs on #webkit).

        * DerivedSources.pro:
2010-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r69315.
        http://trac.webkit.org/changeset/69315
        https://bugs.webkit.org/show_bug.cgi?id=47363

        Forgot to add the new files (Requested by kbalazs on #webkit).

        * Scripts/webkitdirs.pm:
        * WebKitTestRunner/qt/DerivedSources.pro: Added.
2010-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r69315.
        http://trac.webkit.org/changeset/69315
        https://bugs.webkit.org/show_bug.cgi?id=47363

        Forgot to add the new files (Requested by kbalazs on #webkit).

        * WebKit2.pro:

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

ChangeLog
DerivedSources.pro
WebKit2/ChangeLog
WebKit2/WebKit2.pro
WebKitTools/ChangeLog
WebKitTools/Scripts/webkitdirs.pm
WebKitTools/WebKitTestRunner/qt/DerivedSources.pro [new file with mode: 0644]

index 5348992bb183f3785969565651996a063bf674ab..727e8b2c19ac3168f5c951897cfd42647caebd4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r69315.
+        http://trac.webkit.org/changeset/69315
+        https://bugs.webkit.org/show_bug.cgi?id=47363
+
+        Forgot to add the new files (Requested by kbalazs on #webkit).
+
+        * DerivedSources.pro:
+
 2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index 76cb37e6cb86e0338fa1483116529c87ad53ac5f..0015af6eb79dd014f01e2c911d3a31d52044f150 100644 (file)
@@ -8,9 +8,7 @@ SUBDIRS += \
 
 webkit2 {
     SUBDIRS += WebKit2/DerivedSources.pro
-
-    # Uncomment when WTR is ready upstream
-    #SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
+    SUBDIRS += WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
 }
 
 for(subpro, SUBDIRS) {
index 2e2594c7ff7a57d0c5207233fa0f4b462a387e51..7f22726685edbf4ca12072e8fa073b68ad73a556 100644 (file)
@@ -1,3 +1,13 @@
+2010-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r69315.
+        http://trac.webkit.org/changeset/69315
+        https://bugs.webkit.org/show_bug.cgi?id=47363
+
+        Forgot to add the new files (Requested by kbalazs on #webkit).
+
+        * WebKit2.pro:
+
 2010-10-07  Luiz Agostini  <luiz.agostini@openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index 02a8d863becb2d993ae45a3c92524ec001f8efa9..021356d4d477611500e764dd4fc6590a30a31e02 100644 (file)
@@ -103,7 +103,6 @@ INCLUDEPATH = \
     $$INCLUDEPATH
 
 INCLUDEPATH = \
-    $$PWD \
     Platform \
     Platform/CoreIPC \
     Shared \
@@ -307,7 +306,6 @@ SOURCES += \
     Platform/qt/RunLoopQt.cpp \
     Platform/qt/SharedMemoryQt.cpp \
     Platform/qt/WorkQueueQt.cpp \
-    Shared/API/c/WKArray.cpp \
     Shared/API/c/WKCertificateInfo.cpp \
     Shared/API/c/WKNumber.cpp \
     Shared/API/c/WKSerializedScriptValue.cpp \
@@ -378,12 +376,7 @@ SOURCES += \
     UIProcess/WebProcessManager.cpp \
     UIProcess/WebProcessProxy.cpp \
     UIProcess/WebUIClient.cpp \
-    WebProcess/InjectedBundle/API/c/WKBundle.cpp \
-    WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp \
     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp \
-    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp \
-    WebProcess/InjectedBundle/API/c/WKBundlePage.cpp \
-    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp \
     WebProcess/InjectedBundle/InjectedBundle.cpp \
index c9cc356518c0ec1ac637926372e99288f367ccf5..a9535b6c959435c4914afbe717d7721666a483d5 100644 (file)
@@ -1,3 +1,14 @@
+2010-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r69315.
+        http://trac.webkit.org/changeset/69315
+        https://bugs.webkit.org/show_bug.cgi?id=47363
+
+        Forgot to add the new files (Requested by kbalazs on #webkit).
+
+        * Scripts/webkitdirs.pm:
+        * WebKitTestRunner/qt/DerivedSources.pro: Added.
+
 2010-10-07  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
index 48dadcbf259f632c61ac7df4e96bb32a420cbb0f..2df26f79ee54dd7c0362c0df807b62f937d9f4a2 100644 (file)
@@ -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/qt";
     }
 
     for my $subdir (@subdirs) {
diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
new file mode 100644 (file)
index 0000000..6cd716e
--- /dev/null
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+TARGET = dummy
+
+CONFIG -= debug_and_release
+
+SRC_ROOT_DIR = $$replace(PWD, /WebKitTools/WebKitTestRunner/qt, /)
+
+wtr_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
+wtr_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
+generated_files.depends     += wtr_fwheader_generator
+QMAKE_EXTRA_TARGETS         += wtr_fwheader_generator
+
+jsc_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/JavaScriptCore/API $${OUTPUT_DIR}/include qt
+jsc_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
+generated_files.depends     += jsc_fwheader_generator
+QMAKE_EXTRA_TARGETS         += jsc_fwheader_generator
+
+QMAKE_EXTRA_TARGETS        += generated_files