Changeset 52601 in webkit


Ignore:
Timestamp:
Dec 28, 2009 11:15:18 AM (14 years ago)
Author:
eric@webkit.org
Message:

2009-12-28 Laszlo Gombos <Laszlo Gombos>

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 Gombos>

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
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r52596 r52601  
     12009-12-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        [Qt] Fix build break for Qt 4.4
     6        https://bugs.webkit.org/show_bug.cgi?id=30327
     7
     8        No new tests, as there is no new functionality.
     9
     10        * platform/graphics/qt/GraphicsContextQt.cpp:
     11        (WebCore::GraphicsContext::clipOut): Use intersected() instead of
     12        operator &, which was only introduced in Qt version 4.5.
     13
     14        * platform/qt/ScrollbarThemeQt.cpp:
     15        (WebCore::ScrollbarThemeQt::paintScrollCorner): Pass ColorSpace
     16        argument to fillColor() introduced in r50760
     17
    1182009-12-28  Kent Tamura  <tkent@chromium.org>
    219
  • trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

    r51161 r52601  
    10551055    } else {
    10561056        newClip.addRect(p->window());
    1057         newClip.addPath(clippedOut & newClip);
     1057        newClip.addPath(clippedOut.intersected(newClip));
    10581058        p->setClipPath(newClip);
    10591059    }
  • trunk/WebCore/platform/qt/ScrollbarThemeQt.cpp

    r52122 r52601  
    236236
    237237#if QT_VERSION < 0x040500
    238     context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window));
     238    context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window), DeviceColorSpace);
    239239#else
    240240    StylePainter p(context);
  • trunk/WebKitTools/ChangeLog

    r52600 r52601  
     12009-12-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        [Qt] Fix build break for Qt 4.4
     6        https://bugs.webkit.org/show_bug.cgi?id=30327
     7
     8        * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Include QLocale
     9        * DumpRenderTree/qt/LayoutTestControllerQt.cpp: Ditto.
     10        * QtLauncher/main.cpp:
     11        (MainWindow::MainWindow): Qt::WA_TranslucentBackground was
     12        introduced in Qt version 4.5
     13
    1142009-12-28  Adam Barth  <abarth@webkit.org>
    215
  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r52194 r52601  
    4949#include <QFocusEvent>
    5050#include <QFontDatabase>
     51#include <QLocale>
    5152#include <QNetworkAccessManager>
    5253#include <QNetworkReply>
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r52150 r52601  
    3434#include "WorkQueueItemQt.h"
    3535#include <QDir>
     36#include <QLocale>
    3637
    3738extern void qt_dump_editing_callbacks(bool b);
  • trunk/WebKitTools/QtLauncher/main.cpp

    r52340 r52601  
    171171    {
    172172        setAttribute(Qt::WA_DeleteOnClose);
     173#if QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)
    173174        if (qgetenv("QTLAUNCHER_USE_ARGB_VISUALS").toInt() == 1)
    174175            setAttribute(Qt::WA_TranslucentBackground);
     176#endif
    175177
    176178        QSplitter* splitter = new QSplitter(Qt::Vertical, this);
Note: See TracChangeset for help on using the changeset viewer.