QS60Style does not mix well with the stylesheets

QS60Style basically ignores user set / stylesheet set palettes.
Now, tested with:
   * QLineEdit
   * QPushButton
   * QSpinBox
   * QComboBox
   * QAbstractScrollArea
   * QCheckBox
   * QRadioButton
   * QGroupBox
   * QFrame
   * QTreeView
   * QTableView
   * QHeaderView
   * QProgressBar
   * QScrollBar
   * QSplitter
   * QSlider
   * QTabWidget
   * QToolButton
   * QToolBar
and fixed QS60Style so that it obeys externally set palettes.

Task-number: QTBUG-4820
Reviewed-by: Janne Koskinen

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 8e53eee..54af757 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -372,7 +372,7 @@ public:
 
         SF_StateEnabled =     0x0010, // Enabled = the default
         SF_StateDisabled =    0x0020,
-        SF_ColorSkinned =     0x0040,
+        SF_ColorSkinned =     0x0040, // pixmap is colored with foreground pen color
     };
 
     enum CacheClearReason {
@@ -472,7 +472,7 @@ private:
         const QRect &rect, SkinElementFlags flags = KDefaultSkinElementFlags);
 
     static QPixmap cachedPart(QS60StyleEnums::SkinParts part, const QSize &size,
-        SkinElementFlags flags = KDefaultSkinElementFlags);
+        QPainter *painter, SkinElementFlags flags = KDefaultSkinElementFlags);
     static QPixmap cachedFrame(SkinFrameElements frame, const QSize &size,
         SkinElementFlags flags = KDefaultSkinElementFlags);
 
@@ -489,7 +489,7 @@ private:
     static QSize partSize(QS60StyleEnums::SkinParts part,
         SkinElementFlags flags = KDefaultSkinElementFlags);
     static QPixmap part(QS60StyleEnums::SkinParts part, const QSize &size,
-        SkinElementFlags flags = KDefaultSkinElementFlags);
+        QPainter *painter, SkinElementFlags flags = KDefaultSkinElementFlags);
 
     static QFont s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize);