[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
robert at webkit.org
robert at webkit.org
Wed Dec 22 13:37:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9d4ded664fbb20df69059f102bc8dc9628d54f7f
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 21 22:27:17 2010 +0000
2010-09-21 Robert Hogan <robert at webkit.org>
Rubber-stamped by Ariya Hidayat.
[Qt] Build fix against qt trunk
* platform/graphics/qt/ContextShadow.cpp:
(WebCore::ContextShadow::beginShadowLayer):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cd846d..421d09c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21 Robert Hogan <robert at webkit.org>
+
+ Rubber-stamped by Ariya Hidayat.
+
+ [Qt] Build fix against qt trunk
+
+ * platform/graphics/qt/ContextShadow.cpp:
+ (WebCore::ContextShadow::beginShadowLayer):
+
2010-09-21 Tony Chang <tony at chromium.org>
Unreviewed, QT build fix.
diff --git a/WebCore/platform/graphics/qt/ContextShadow.cpp b/WebCore/platform/graphics/qt/ContextShadow.cpp
index 4609923..b8fa914 100644
--- a/WebCore/platform/graphics/qt/ContextShadow.cpp
+++ b/WebCore/platform/graphics/qt/ContextShadow.cpp
@@ -234,7 +234,7 @@ QPainter* ContextShadow::beginShadowLayer(QPainter* p, const QRectF &rect)
QRect clipRect;
if (p->hasClipping())
#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
- clipRect = p->clipBoundingRect();
+ clipRect = p->clipBoundingRect().toAlignedRect();
#else
clipRect = p->clipRegion().boundingRect();
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list