diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 05:47:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 05:47:43 (GMT) |
| commit | 5054fafde6b32003c8c00877f2579c611d1524f3 (patch) | |
| tree | 9f79976f970095706e82d7d65b068c1e7b728d97 /src/gui/styles/qwindowsstyle.cpp | |
| parent | dd652f37353a01e0172e20f1e7ef24b001a281db (diff) | |
| parent | dc68651b60b552e010735903e45328f8ebf18f69 (diff) | |
| download | Qt-5054fafde6b32003c8c00877f2579c611d1524f3.zip Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.gz Qt-5054fafde6b32003c8c00877f2579c611d1524f3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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); |