summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style_p.h
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2011-03-22 08:10:13 (GMT)
committerSami Merila <sami.merila@nokia.com>2011-03-22 08:10:13 (GMT)
commit6733b02876d0f305691e6fc8060502bb3d783c36 (patch)
tree8b9d9611eee494a01ce513c097310457b0a45109 /src/gui/styles/qs60style_p.h
parentce61e3c3c6ff7f00d9b756c99e8fc031a69e68db (diff)
downloadQt-6733b02876d0f305691e6fc8060502bb3d783c36.zip
Qt-6733b02876d0f305691e6fc8060502bb3d783c36.tar.gz
Qt-6733b02876d0f305691e6fc8060502bb3d783c36.tar.bz2
QS60Style: Update placeholder texture to real one
Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
-rw-r--r--src/gui/styles/qs60style_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 8c023bf..3628b27 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -554,7 +554,7 @@ public:
static QPixmap frame(SkinFrameElements frame, const QSize &size,
SkinElementFlags flags = KDefaultSkinElementFlags);
- static QPixmap backgroundTexture();
+ static QPixmap backgroundTexture(bool skipCreation = false);
static QPixmap placeHolderTexture();
#ifdef Q_WS_S60
@@ -595,9 +595,9 @@ private:
// set S60 font for widget
void setFont(QWidget *widget) const;
- void setThemePalette(QWidget *widget) const;
+ static void setThemePalette(QWidget *widget);
void setThemePalette(QPalette *palette) const;
- void setThemePaletteHash(QPalette *palette) const;
+ static void setThemePaletteHash(QPalette *palette);
static void storeThemePalette(QPalette *palette);
static void deleteThemePalette();
static bool equalToThemePalette(QColor color, QPalette::ColorRole role);