[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

hyatt at apple.com hyatt at apple.com
Mon Feb 21 00:33:30 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit c0e611b0bb8df5931f180dcea6fc43a47292db2d
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 21:51:16 2011 +0000

    Fix Qt build bustage.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77291 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp
index 4804e48..d4688cf 100644
--- a/Source/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQt.cpp
@@ -726,7 +726,7 @@ bool RenderThemeQt::paintMenuList(RenderObject* o, const PaintInfo& i, const Int
     initStyleOption(p.widget, opt);
     initializeCommonQStyleOptions(opt, o);
 
-    const QPoint topLeft = r.topLeft();
+    const QPoint topLeft = r.location();
     p.painter->translate(topLeft);
     opt.rect.moveTo(QPoint(0, 0));
     opt.rect.setSize(r.size());
@@ -825,7 +825,7 @@ bool RenderThemeQt::paintProgressBar(RenderObject* o, const PaintInfo& pi, const
     option.minimum = 0;
     option.progress = (renderProgress->position() * std::numeric_limits<int>::max());
 
-    const QPoint topLeft = r.topLeft();
+    const QPoint topLeft = r.location();
     p.painter->translate(topLeft);
     option.rect.moveTo(QPoint(0, 0));
     option.rect.setSize(r.size());
@@ -887,7 +887,7 @@ bool RenderThemeQt::paintSliderTrack(RenderObject* o, const PaintInfo& pi,
         option.state |= QStyle::State_Sunken;
     }
 
-    const QPoint topLeft = r.topLeft();
+    const QPoint topLeft = r.location();
     p.painter->translate(topLeft);
     option.rect.moveTo(QPoint(0, 0));
     option.rect.setSize(r.size());

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list