[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

pfeldman at chromium.org pfeldman at chromium.org
Sun Feb 20 22:54:46 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit dba82454fae08c63dc54c548bdef7a70b21d29db
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 16:57:48 2011 +0000

    2011-01-13  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: Qt build fix.
    
            * WebCore.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b1a1de6..829ad2e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-13  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: Qt build fix.
+
+        * WebCore.pri:
+
 2011-01-12  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index f79d497..bdc3b8f 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -651,6 +651,12 @@ inspectorBackendStub.tempNames = $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERA
 inspectorBackendStub.commands = $$QMAKE_COPY $$replace(inspectorBackendStub.tempNames, "/", $$QMAKE_DIR_SEP)
 addExtraCompiler(inspectorBackendStub)
 
+# GENERATOR 2-a: inspector injected script source compiler
+injectedScriptSource.output = $${WC_GENERATED_SOURCES_DIR}/InjectedScriptSource.h
+injectedScriptSource.input = $$PWD/inspector/InjectedScriptSource.js
+injectedScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptSource_js $$PWD/inspector/InjectedScriptSource.js  $${WC_GENERATED_SOURCES_DIR}/InjectedScriptSource.h
+addExtraCompiler(injectedScriptSource)
+
 # GENERATOR 3: tokenizer (flex)
 tokenizer.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.cpp
 tokenizer.input = TOKENIZER

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list