[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e6bc81d4d60e92145c53edd66ef546a055992f62
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 28 19:15:18 2009 +0000

    2009-12-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Adam Barth.
    
            [Qt] Fix build break for Qt 4.4
            https://bugs.webkit.org/show_bug.cgi?id=30327
    
            No new tests, as there is no new functionality.
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::clipOut): Use intersected() instead of
            operator &, which was only introduced in Qt version 4.5.
    
            * platform/qt/ScrollbarThemeQt.cpp:
            (WebCore::ScrollbarThemeQt::paintScrollCorner): Pass ColorSpace
            argument to fillColor() introduced in r50760
    2009-12-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Adam Barth.
    
            [Qt] Fix build break for Qt 4.4
            https://bugs.webkit.org/show_bug.cgi?id=30327
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Include QLocale
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp: Ditto.
            * QtLauncher/main.cpp:
            (MainWindow::MainWindow): Qt::WA_TranslucentBackground was
            introduced in Qt version 4.5
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 832790b..516311e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Fix build break for Qt 4.4
+        https://bugs.webkit.org/show_bug.cgi?id=30327
+
+        No new tests, as there is no new functionality.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clipOut): Use intersected() instead of
+        operator &, which was only introduced in Qt version 4.5.
+
+        * platform/qt/ScrollbarThemeQt.cpp:
+        (WebCore::ScrollbarThemeQt::paintScrollCorner): Pass ColorSpace
+        argument to fillColor() introduced in r50760
+
 2009-12-28  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index a095476..ecdb5f5 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1054,7 +1054,7 @@ void GraphicsContext::clipOut(const Path& path)
         p->setClipPath(newClip, Qt::IntersectClip);
     } else {
         newClip.addRect(p->window());
-        newClip.addPath(clippedOut & newClip);
+        newClip.addPath(clippedOut.intersected(newClip));
         p->setClipPath(newClip);
     }
 }
diff --git a/WebCore/platform/qt/ScrollbarThemeQt.cpp b/WebCore/platform/qt/ScrollbarThemeQt.cpp
index df1c56a..93709b2 100644
--- a/WebCore/platform/qt/ScrollbarThemeQt.cpp
+++ b/WebCore/platform/qt/ScrollbarThemeQt.cpp
@@ -235,7 +235,7 @@ void ScrollbarThemeQt::paintScrollCorner(ScrollView* scrollView, GraphicsContext
     }
 
 #if QT_VERSION < 0x040500
-    context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window));
+    context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window), DeviceColorSpace);
 #else
     StylePainter p(context);
     if (!p.isValid())
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f378dc5..cdbe39e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Adam Barth.
+
+        [Qt] Fix build break for Qt 4.4
+        https://bugs.webkit.org/show_bug.cgi?id=30327
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Include QLocale
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp: Ditto.
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow): Qt::WA_TranslucentBackground was
+        introduced in Qt version 4.5
+
 2009-12-28  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index d8469df..46b6bf1 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -48,6 +48,7 @@
 #include <QFileInfo>
 #include <QFocusEvent>
 #include <QFontDatabase>
+#include <QLocale>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index bc617f8..b240003 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -33,6 +33,7 @@
 #include "WorkQueue.h"
 #include "WorkQueueItemQt.h"
 #include <QDir>
+#include <QLocale>
 
 extern void qt_dump_editing_callbacks(bool b);
 extern void qt_dump_resource_load_callbacks(bool b);
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index 836c7dc..f7ac4b2 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -170,8 +170,10 @@ public:
     MainWindow(QString url = QString()): currentZoom(100)
     {
         setAttribute(Qt::WA_DeleteOnClose);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)
         if (qgetenv("QTLAUNCHER_USE_ARGB_VISUALS").toInt() == 1)
             setAttribute(Qt::WA_TranslucentBackground);
+#endif
 
         QSplitter* splitter = new QSplitter(Qt::Vertical, this);
         setCentralWidget(splitter);

-- 
WebKit Debian packaging