diff options
| author | aavit <qt-info@nokia.com> | 2010-11-19 12:30:09 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-11-19 12:30:09 (GMT) |
| commit | 8034cab2cce55b43dcc1100d0b22f8c85eb733c2 (patch) | |
| tree | 5a1637fa48ce23e12c6a51490f6a481fd1ca1a5a /src/gui/styles/qs60style_p.h | |
| parent | e614223831f2b3cc9051ae88586370a7d5b63db2 (diff) | |
| parent | 1d152964adec62d03ce2f4a45ca40ddbd05819ae (diff) | |
| download | Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.zip Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.tar.gz Qt-8034cab2cce55b43dcc1100d0b22f8c85eb733c2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index b46f75e..db4285d 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -523,8 +523,12 @@ public: static bool isSingleClickUi(); static bool isWidgetPressed(const QWidget *widget); - // calculates average color based on button skin graphics (minus borders). +#ifdef Q_WS_S60 + static void deleteStoredSettings(); + // calculates average color based on theme graphics (minus borders). QColor colorFromFrameGraphics(SkinFrameElements frame) const; +#endif + QColor calculatedColor(SkinFrameElements frame) const; //set theme palette for application void setThemePalette(QApplication *application) const; @@ -542,7 +546,6 @@ public: static const int m_numberOfLayouts; mutable QHash<QPair<QS60StyleEnums::FontCategories , int>, QFont> m_mappedFontsCache; - mutable QHash<SkinFrameElements, QColor> m_colorCache; // Has one entry per SkinFrameElements static const struct frameElementCenter { |