[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 13:40:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 09c050a22108cb0d51133a4d66de093442b4bf3a
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 23:40:08 2010 +0000
2010-09-22 Andras Becsi <abecsi at webkit.org>
Speculative build fix for the Qt Windows bots.
* Api/DerivedSources.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68099 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index 233acf0..d8bd1db 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -10,7 +10,7 @@ DESTDIR = ../../../include/QtWebKit
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
ESCAPE = ""
-win32-msvc* | wince* | (contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH)) {
+win32-msvc* | wince* | contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) {
# MinGW's make will run makefile commands using sh, even if make
# was run from the Windows shell, if it finds sh in the path.
ESCAPE = "^"
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4a4a069..a92b73c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-22 Andras Becsi <abecsi at webkit.org>
+
+ Speculative build fix for the Qt Windows bots.
+
+ * Api/DerivedSources.pro:
+
2010-09-22 Jamey Hicks <jamey.hicks at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list