From: mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 3 Nov 2006 09:33:19 +0000 (+0000)
Subject:         Reviewed and landed by Maciej.
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=041ce7bc202e5cd66fe2b85856cc184251d1c52c

    Reviewed and landed by Maciej.

        Compile on the Qt platform.

        * ksvg2/misc/KCanvasRenderingStyle.h:
        * platform/qt/RenderThemeQt.cpp:
        (WebCore::RenderThemeQt::getStylePainterAndWidgetFromPaintInfo):



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e67ead672ae0..1d0f8c75eef3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-03  Zack Rusin  <zack@kde.org>
+
+        Reviewed and landed by Maciej.
+        
+        Compile on the Qt platform.
+
+        * ksvg2/misc/KCanvasRenderingStyle.h:
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::getStylePainterAndWidgetFromPaintInfo):
+
 2006-11-03  Zack Rusin  <zack@kde.org>
 
         Reviewed by Hyatt. Landed by Maciej.
diff --git a/WebCore/ksvg2/misc/KCanvasRenderingStyle.h b/WebCore/ksvg2/misc/KCanvasRenderingStyle.h
index b3683bd87fe2..e7986e9b9a89 100644
--- a/WebCore/ksvg2/misc/KCanvasRenderingStyle.h
+++ b/WebCore/ksvg2/misc/KCanvasRenderingStyle.h
@@ -27,7 +27,9 @@
 
 #include <wtf/Vector.h>
 
+#if PLATFORM(CG)
 #include "QuartzSupport.h"
+#endif
 
 namespace WebCore {
 
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index a2b73aac8182..6529a1b53478 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -143,7 +143,7 @@ void RenderThemeQt::addIntrinsicMargins(RenderStyle* style) const
 
 bool RenderThemeQt::getStylePainterAndWidgetFromPaintInfo(const RenderObject::PaintInfo& i, QStyle*& style, QPainter*& painter, QWidget*& widget) const
 {
-    painter = (i.p ? static_cast<QPainter*>(i.p->platformContext()) : 0);
+    painter = (i.context ? static_cast<QPainter*>(i.context->platformContext()) : 0);
     widget = (painter ? static_cast<QWidget*>(painter->device()) : 0);
     style = (widget ? widget->style() : 0);