Qt build fix.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Apr 2008 07:43:43 +0000 (07:43 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Apr 2008 07:43:43 +0000 (07:43 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@32374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/qt/RenderThemeQt.cpp
WebCore/platform/qt/RenderThemeQt.h

index 9998a8f..d6cb840 100644 (file)
@@ -1,3 +1,11 @@
+2008-04-22  Simon Hausmann  <hausmann@webkit.org>
+
+        Qt build fix.
+
+        * platform/qt/RenderThemeQt.cpp: Adjust isControlStyled signature to
+        the signature in the base class.
+        * platform/qt/RenderThemeQt.h: Ditto.
+
 2008-04-19  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Reviewed by Darin.
index 9c984fe..25b6aab 100644 (file)
@@ -117,7 +117,7 @@ void RenderThemeQt::adjustRepaintRect(const RenderObject* o, IntRect& r)
 }
 
 bool RenderThemeQt::isControlStyled(const RenderStyle* style, const BorderData& border,
-                                     const BackgroundLayer& background, const Color& backgroundColor) const
+                                     const FillLayer& background, const Color& backgroundColor) const
 {
     if (style->appearance() == TextFieldAppearance || style->appearance() == TextAreaAppearance || style->appearance() == ListboxAppearance)
         return style->border() != border;
index 9e41d68..70735cc 100644 (file)
@@ -54,7 +54,7 @@ public:
     virtual void adjustRepaintRect(const RenderObject* o, IntRect& r);
 
     virtual bool isControlStyled(const RenderStyle*, const BorderData&,
-                                 const BackgroundLayer&, const Color&) const;
+                                 const FillLayer&, const Color&) const;
 
     // The platform selection color.
     virtual Color platformActiveSelectionBackgroundColor() const;