[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5bd9116135bb6fd289fa48b02f38b434146b222b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 15:59:19 2010 +0000

    [Qt] Unreviewed buildfix for r53547.
    
    JavaScriptCore:
    
    * DerivedSources.pro:
    
    WebCore:
    
    * WebCore.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 14ddd01..9933062 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed buildfix for r53547.
+
+        * DerivedSources.pro:
+
 2010-01-20  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/DerivedSources.pro b/JavaScriptCore/DerivedSources.pro
index b7480a4..bd9f6ab 100644
--- a/JavaScriptCore/DerivedSources.pro
+++ b/JavaScriptCore/DerivedSources.pro
@@ -88,7 +88,7 @@ addExtraCompiler(rvctstubs)
 win32-msvc*|wince*: PREPROCESSOR = "--preprocessor=\"$$QMAKE_CC /E\""
 ctgen.output = $$JSC_GENERATED_SOURCES_DIR/chartables.c
 ctgen.wkScript = $$PWD/pcre/dftables
-ctgen.input = $$ctgen.wkScript
+ctgen.input = ctgen.wkScript
 ctgen.commands = perl $$ctgen.wkScript ${QMAKE_FILE_OUT} $$PREPROCESSOR
 ctgen.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_JSC_GENERATED_SOURCES_DIR}${QMAKE_FILE_BASE}
 addExtraCompiler(ctgen)
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 775b0d4..d5eae7b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed buildfix for r53547.
+
+        * WebCore.pri:
+
 2010-01-20  Ben Murdoch  <benm at google.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 2809a4f..0f11323 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -666,7 +666,7 @@ addExtraCompiler(colordata)
 # GENERATOR 9:
 stylesheets.wkScript = $$PWD/css/make-css-file-arrays.pl
 stylesheets.output = $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
-stylesheets.input = $$stylesheets.wkScript
+stylesheets.input = stylesheets.wkScript
 stylesheets.commands = perl $$stylesheets.wkScript --preprocessor \"$${QMAKE_MOC} -E\" $${WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheets.h ${QMAKE_FILE_OUT} $$STYLESHEETS_EMBED
 stylesheets.depends = $$STYLESHEETS_EMBED
 stylesheets.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/UserAgentStyleSheets.h
@@ -683,7 +683,7 @@ addExtraCompiler(xpathbison)
 # The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in WebKit/mac/Configurations/.
 webkitversion.wkScript = $$PWD/../WebKit/scripts/generate-webkitversion.pl
 webkitversion.output = $${WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
-webkitversion.input = $$webkitversion.wkScript
+webkitversion.input = webkitversion.wkScript
 webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
 webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
 webkitversion.wkAddOutputToSources = false

-- 
WebKit Debian packaging