Avoid overwriting a user set palette.

The polish(QWidget*) function is called the first time a widget is
shown and therefore setting the widget's palette in this function will
overwrite the user set palette if one is specified before show() is
called. The solution is to break this into two parts, the first part
sets the global palette in polish(QApplication*) and this is the
part of the palette that is independent of widget. The second part
involves adding the widget specific palettes using the QApplication::
setPalette() function that takes a classname and this is done in the
polish(QWidget*) function.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index 253eb61..945e182 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -45,6 +45,8 @@ public:
     QRect subElementRect(SubElement element, const QStyleOption *opt, const QWidget *widget = 0) const;
     void polish(QWidget *widget);
     void unpolish(QWidget *widget);
+    void polish(QApplication *application);
+    void unpolish(QApplication *application);
 
     void setStyleProperty(const char *name, const QVariant &value);
     QVariant styleProperty(const char *name) const;
@@ -69,6 +71,7 @@ protected slots:
 private:
     Q_DISABLE_COPY(QS60Style)
     friend class QStyleFactory;
+    QPalette originalPalette;
 };
 
 #endif // QT_NO_STYLE_S60