diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-05-28 11:49:08 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-05-28 11:49:08 (GMT) |
| commit | 1ee484031d2a240bd7019753e83bb473ea9891de (patch) | |
| tree | a3dbde228d49159ecac8ca2f2c55eb41a60616ec /src/gui/styles/qs60style_p.h | |
| parent | 131d8f90aa2991866884a896fdebcc05a020a905 (diff) | |
| download | Qt-1ee484031d2a240bd7019753e83bb473ea9891de.zip Qt-1ee484031d2a240bd7019753e83bb473ea9891de.tar.gz Qt-1ee484031d2a240bd7019753e83bb473ea9891de.tar.bz2 | |
Enabled QtS60Style background filling also for _simulated, by moving
some code to qs60style.cpp. De-duplicated some code in
qt_s60_fill_background.
The unused QT_S60STYLE_LAYOUTDATA_SIMULATED had to go, too.
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index bedff58..22b01f6 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -388,7 +388,6 @@ public: static int focusRectPenWidth(); -#if defined(QT_S60STYLE_LAYOUTDATA_SIMULATED) static const layoutHeader m_layoutHeaders[]; static const short data[][MAX_PIXELMETRICS]; @@ -398,7 +397,6 @@ public: static short const *m_pmPointer; // number of layouts supported by the style static const int m_numberOfLayouts; -#endif // defined(QT_S60STYLE_LAYOUTDATA_SIMULATED) mutable QHash<QPair<QS60StyleEnums::FontCategories , int>, QFont> m_mappedFontsCache; mutable QHash<QS60StylePrivate::SkinFrameElements, QColor> m_colorCache; |