diff options
| author | Espen Riskedal <espenr@trolltech.com> | 2009-06-11 17:44:59 (GMT) |
|---|---|---|
| committer | Espen Riskedal <espenr@trolltech.com> | 2009-06-11 17:44:59 (GMT) |
| commit | 35acd2ae3850faa3d06227fcfdbc5d61858c8d7b (patch) | |
| tree | f7c5bf0fde156470dc9e7b8f4552d27f2516eaaf | |
| parent | 17f4de60fb4e13e470ae2101460174b41e828e1f (diff) | |
| parent | b916b39b8a0612fb17e07d1a3bf5d91a8ecd5f42 (diff) | |
| download | Qt-35acd2ae3850faa3d06227fcfdbc5d61858c8d7b.zip Qt-35acd2ae3850faa3d06227fcfdbc5d61858c8d7b.tar.gz Qt-35acd2ae3850faa3d06227fcfdbc5d61858c8d7b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index 362e29c..684f232 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -274,7 +274,7 @@ QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size, const QRect leftRect = rightRect.translated(cornerWidth - rectWidth, 0); const QRect centerRect = drawOnlyCenter ? rect : rect.adjusted(cornerWidth, cornerWidth, -cornerWidth, -cornerWidth); - QImage result(size, QImage::Format_ARGB32); + QPixmap result(size); result.fill(Qt::transparent); QPainter painter(&result); @@ -303,7 +303,7 @@ QPixmap QS60StylePrivate::frame(SkinFrameElements frame, const QSize &size, drawPart(center, &painter, centerRect, flags); #endif - return QPixmap::fromImage(result); + return result; } void QS60StylePrivate::setStyleProperty_specific(const char *name, const QVariant &value) |