diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-15 15:30:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-15 15:30:08 (GMT) |
| commit | fbfc03eb8e7c3d41c4331895ae83912a4275e6c2 (patch) | |
| tree | ae6b553899bba4922d1210b0f8dc8da994834bc7 /src/gui/styles/qwindowsstyle.cpp | |
| parent | 2d01fb17dbf7590dd60987b08433252eb95f55e0 (diff) | |
| parent | 9075ec9011e5f678563ab15024e8d9731e938963 (diff) | |
| download | Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.zip Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.tar.gz Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/styles/qwindowsstyle.cpp')
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 4f25e68..4c66bbb 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -1061,6 +1061,8 @@ QPixmap QWindowsStyle::standardPixmap(StandardPixmap standardPixmap, const QStyl } } break; + default: + break; } if (!desktopIcon.isNull()) { return desktopIcon; @@ -1375,11 +1377,8 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QRect r = opt->rect; int size = qMin(r.height(), r.width()); QPixmap pixmap; - QString pixmapName; - pixmapName.sprintf("%s-%s-%d-%d-%d-%lld", - "$qt_ia", metaObject()->className(), - uint(opt->state), pe, - size, opt->palette.cacheKey()); + QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") + QLatin1String(metaObject()->className()), opt, QSize(size, size)) + + QLatin1Char('-') + QString::number(pe); if (!QPixmapCache::find(pixmapName, pixmap)) { int border = size/5; int sqsize = 2*(size/2); |