[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:51:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 79da91107288ab3b9e55240c4543cde3eddc282e
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 10 01:59:39 2010 +0000
Qt build fix III.
JavaScriptCore:
* wtf/text/WTFString.h:
WebCore:
* css/CSSSelector.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65032 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7a40169..747f345 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
2010-08-09 Gavin Barraclough <barraclough at apple.com>
+ Qt build fix III.
+
+ * wtf/text/WTFString.h:
+
+2010-08-09 Gavin Barraclough <barraclough at apple.com>
+
Qt build fix.
* wtf/qt/StringQt.cpp:
diff --git a/JavaScriptCore/wtf/text/WTFString.h b/JavaScriptCore/wtf/text/WTFString.h
index 93ad586..6af519c 100644
--- a/JavaScriptCore/wtf/text/WTFString.h
+++ b/JavaScriptCore/wtf/text/WTFString.h
@@ -433,5 +433,6 @@ using WTF::charactersAreAllASCII;
using WTF::charactersToInt;
using WTF::charactersToFloat;
using WTF::charactersToDouble;
+using WTF::operator+;
#endif
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9cc6007..118d65f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-09 Gavin Barraclough <barraclough at apple.com>
+
+ Qt build fix III.
+
+ * css/CSSSelector.cpp:
+
2010-08-09 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/css/CSSSelector.cpp b/WebCore/css/CSSSelector.cpp
index ca6cc3d..bd6d14f 100644
--- a/WebCore/css/CSSSelector.cpp
+++ b/WebCore/css/CSSSelector.cpp
@@ -35,8 +35,6 @@
namespace WebCore {
-using WTF::operator+;
-
using namespace HTMLNames;
class CSSSelectorBag : public Noncopyable {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list