[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
simon.fraser at apple.com
simon.fraser at apple.com
Fri Jan 21 14:41:55 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 43783ef640b470ec5b7aba47e0cea102f894af09
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 24 21:26:05 2010 +0000
2010-12-24 Simon Fraser <simon.fraser at apple.com>
Fix the Qt build after r74650.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3e6291d..cfb332e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-24 Simon Fraser <simon.fraser at apple.com>
+
+ Fix the Qt build after r74650.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+
2010-12-24 Benjamin Poulain <ikipou at gmail.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index 7ac5897..3809319 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -35,9 +35,12 @@
#include <WebCore/Page.h>
#include <WebCore/PageGroup.h>
#include <wtf/MathExtras.h>
-#include <wtf/RetainPtr.h>
#include <wtf/text/CString.h>
+#if PLATFORM(CF)
+#include <wtf/RetainPtr.h>
+#endif
+
// FIXME: Implement localization.
#define UI_STRING(string, description) String::fromUTF8(string, strlen(string))
#define UI_STRING_KEY(string, key, description) String::fromUTF8(string, strlen(string))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list