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

abarth at webkit.org abarth at webkit.org
Wed Dec 22 12:47:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3ac2bc06a531aba1b435dd9690b2a6ed3e03d34e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 07:07:32 2010 +0000

    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Attempt to fix the Qt build.
    
            * WebCore.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66367 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b3d2db..8c17fa0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-30  Adam Barth  <abarth at webkit.org>
 
+        Attempt to fix the Qt build.
+
+        * WebCore.pri:
+
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
         Attempt to fix Chromium build.
 
         * WebCore.gyp/WebCore.gyp:
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 36349d5..64eca1f 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -147,8 +147,13 @@ IDL_BINDINGS += \
     dom/WebKitAnimationEvent.idl \
     dom/WebKitTransitionEvent.idl \
     dom/WheelEvent.idl \
-    html/Blob.idl \
-    html/BlobBuilder.idl \
+    fileapi/Blob.idl \
+    fileapi/BlobBuilder.idl \
+    fileapi/File.idl \
+    fileapi/FileError.idl \
+    fileapi/FileList.idl \
+    fileapi/FileReader.idl \
+    fileapi/FileWriter.idl \
     html/canvas/ArrayBufferView.idl \
     html/canvas/ArrayBuffer.idl \
     html/canvas/Int8Array.idl \
@@ -175,11 +180,6 @@ IDL_BINDINGS += \
     html/DataGridColumn.idl \
     html/DataGridColumnList.idl \
     html/DOMFormData.idl \
-    html/File.idl \
-    html/FileError.idl \
-    html/FileList.idl \
-    html/FileReader.idl \
-    html/FileWriter.idl \
     html/HTMLAllCollection.idl \
     html/HTMLAudioElement.idl \
     html/HTMLAnchorElement.idl \
@@ -546,7 +546,7 @@ addExtraCompiler(cssvalues)
 idl.output = $${WC_GENERATED_SOURCES_DIR}/JS${QMAKE_FILE_BASE}.cpp
 idl.input = IDL_BINDINGS
 idl.wkScript = $$PWD/bindings/scripts/generate-bindings.pl
-idl.commands = perl -I$$PWD/bindings/scripts $$idl.wkScript --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator JS --include $$PWD/dom --include $$PWD/html --include $$PWD/xml --include $$PWD/svg --outputDir $$WC_GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
+idl.commands = perl -I$$PWD/bindings/scripts $$idl.wkScript --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator JS --include $$PWD/dom --include $$PWD/fileapi --include $$PWD/html --include $$PWD/xml --include $$PWD/svg --outputDir $$WC_GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
 idl.depends = $$PWD/bindings/scripts/CodeGenerator.pm \
               $$PWD/bindings/scripts/CodeGeneratorJS.pm \
               $$PWD/bindings/scripts/IDLParser.pm \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list