diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-28 09:34:20 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-28 09:34:20 (GMT) |
| commit | a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (patch) | |
| tree | 510973b95c107fd08f42423fd04a75e3da0bb5d9 /src/gui/styles | |
| parent | 3643028959f0b38350e57e60ba4000435b75e592 (diff) | |
| download | Qt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.zip Qt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.tar.gz Qt-a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a.tar.bz2 | |
Compile fixes after latest merge of 4.6.
The ususal suspects like QScopedPointer fixes, but also some changes
since the introduction of qcore_unix.*
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index b083f4b..2c486a2 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2854,8 +2854,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon, extern QPoint qt_s60_fill_background_offset(const QWidget *targetWidget); -bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint &offset, - const QBrush &brush) +bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QBrush &brush) { const QPixmap backgroundTexture(QS60StylePrivate::backgroundTexture()); if (backgroundTexture.cacheKey() != brush.texture().cacheKey()) @@ -2864,8 +2863,7 @@ bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint const QPaintDevice *target = painter->device(); if (target->devType() == QInternal::Widget) { const QWidget *widget = static_cast<const QWidget *>(target); - const QRegion translated = rgn.translated(offset); - const QVector<QRect> &rects = translated.rects(); + const QVector<QRect> &rects = rgn.rects(); for (int i = 0; i < rects.size(); ++i) { const QRect rect(rects.at(i)); painter->drawPixmap(rect.topLeft(), backgroundTexture, |