[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ossy at webkit.org
ossy at webkit.org
Sun Feb 20 22:54:54 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 9542f0cc7e3c32e727430399499bb2869d43e47c
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 13 17:25:27 2011 +0000
Unreviewed buildfix after r75715.
* WebCore.pri:
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75718 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 829ad2e..6acb9b8 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-13 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed buildfix after r75715.
+
+ * WebCore.pri:
+ * WebCore.pro:
+
2011-01-13 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: Qt build fix.
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index bdc3b8f..e9d27b2 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -538,6 +538,7 @@ IDL_BINDINGS += \
INSPECTOR_INTERFACES = inspector/Inspector.idl
INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc
+INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
v8: wrapperFactoryArg = --wrapperFactoryV8
else: wrapperFactoryArg = --wrapperFactory
@@ -653,7 +654,7 @@ 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.input = INJECTED_SCRIPT_SOURCE
injectedScriptSource.commands = perl $$PWD/inspector/xxd.pl InjectedScriptSource_js $$PWD/inspector/InjectedScriptSource.js $${WC_GENERATED_SOURCES_DIR}/InjectedScriptSource.h
addExtraCompiler(injectedScriptSource)
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index 39bb738..09a6e2a 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -1932,7 +1932,6 @@ HEADERS += \
inspector/ConsoleMessage.h \
inspector/InjectedScript.h \
inspector/InjectedScriptHost.h \
- inspector/InjectedScriptSource.h \
inspector/InspectorApplicationCacheAgent.h \
inspector/InspectorController.h \
inspector/InspectorCSSAgent.h \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list