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

loislo at chromium.org loislo at chromium.org
Wed Dec 22 12:17:42 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 50a68d9e955199ab33c84123d775fbfbd06f8ce4
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 15:30:11 2010 +0000

    2010-08-18  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Unreviewed qt build fix.
    
            * WebCore.pri:
    
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ca3fe4..2768766 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-18  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Unreviewed qt build fix.
+
+        * WebCore.pri:
+
 2010-08-17  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index e3f8f5d..de9638f 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -568,8 +568,8 @@ addExtraCompiler(inspectorIDL)
 inspectorBackendStub.wkAddOutputToSources = false
 inspectorBackendStub.output = generated/InspectorBackendStub.qrc
 inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC
-# standard QMAKE_COPY and COPY_FILE are failing because copy/xcopy doesn't work with back slashes and windows doesn't have cp.
-inspectorBackendStub.commands = perl -e\"use File::Copy; copy(\$$ARGV[0], \$$ARGV[1]) or die;\" $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
+inspectorBackendStub.tempNames = $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
+inspectorBackendStub.commands = $$QMAKE_COPY $$replace(inspectorBackendStub.tempNames, "/", $$QMAKE_DIR_SEP)
 addExtraCompiler(inspectorBackendStub)
 
 # GENERATOR 3: tokenizer (flex)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list