diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 21:43:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 21:43:02 (GMT) |
| commit | e61071a2a170eaeb524778e9e903100323b88bbe (patch) | |
| tree | 03cfc506e95751cb074429a4b6b4e1ffb2ae621c /src/gui/styles/qs60style_p.h | |
| parent | 7a81735272b5ee065f499a492cca4b4a703e0659 (diff) | |
| parent | 285f49d680a824e788eb6cf107f70cd94d358dfe (diff) | |
| download | Qt-e61071a2a170eaeb524778e9e903100323b88bbe.zip Qt-e61071a2a170eaeb524778e9e903100323b88bbe.tar.gz Qt-e61071a2a170eaeb524778e9e903100323b88bbe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
Fix auto-test regression in tst_QDoubleValidator
QS60Style: Color calculation should be optimized
QS60Style: Color calculation should be optimized
With some locales, QDoubleValidator would not accept "C" locale valid numbers
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 { |