diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-20 10:04:34 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2010-05-20 10:04:34 (GMT) |
| commit | 6fb92f77f6d6b5b685b8748a1a35ffbd7df8b76b (patch) | |
| tree | ba9ec7bc61be5ae87bd93fa055c6fb628b3d8404 /src/gui/styles/qgtkpainter.cpp | |
| parent | 98972c1b271de1292b4e46484fe689d62a8b8e62 (diff) | |
| parent | e6557220bccbdbbc218dc9eab0eb426ba774435e (diff) | |
| download | Qt-6fb92f77f6d6b5b685b8748a1a35ffbd7df8b76b.zip Qt-6fb92f77f6d6b5b685b8748a1a35ffbd7df8b76b.tar.gz Qt-6fb92f77f6d6b5b685b8748a1a35ffbd7df8b76b.tar.bz2 | |
Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/gui/styles/qgtkpainter.cpp')
| -rw-r--r-- | src/gui/styles/qgtkpainter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp index 1f68f2f..79c53e9 100644 --- a/src/gui/styles/qgtkpainter.cpp +++ b/src/gui/styles/qgtkpainter.cpp @@ -47,6 +47,7 @@ // This class is primarily a wrapper around the gtk painter functions // and takes care of converting all such calls into cached Qt pixmaps. +#include <private/qstylehelper_p.h> #include <QtGui/QWidget> #include <QtGui/QStyleOption> #include <QtGui/QPixmapCache> @@ -155,8 +156,12 @@ static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType const QSize &size, GtkWidget *widget = 0) { // Note the widget arg should ideally use the widget path, though would compromise performance - QString tmp = QString(QLS("%0-%1-%2-%3x%4-%5")).arg(key).arg(uint(state)).arg(shadow) - .arg(size.width()).arg(size.height()).arg(quintptr(widget)); + QString tmp = key + % HexString<uint>(state) + % HexString<uint>(shadow) + % HexString<uint>(size.width()) + % HexString<uint>(size.height()) + % HexString<quint64>(quint64(widget)); return tmp; } |