diff options
| author | Sami Merilä <sami.merila@nokia.com> | 2009-10-29 15:41:52 (GMT) |
|---|---|---|
| committer | Sami Merilä <sami.merila@nokia.com> | 2009-10-29 15:41:52 (GMT) |
| commit | da9880eaed0d09338717db1a73db01e6b0ab080d (patch) | |
| tree | d07b778a464cacb0ce9013942fd5b3cc1b80616d /src/gui/styles/qs60style_simulated.cpp | |
| parent | 198b974587ba9751a2bdc73464c05c164d49f10c (diff) | |
| download | Qt-da9880eaed0d09338717db1a73db01e6b0ab080d.zip Qt-da9880eaed0d09338717db1a73db01e6b0ab080d.tar.gz Qt-da9880eaed0d09338717db1a73db01e6b0ab080d.tar.bz2 | |
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
Diffstat (limited to 'src/gui/styles/qs60style_simulated.cpp')
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index 8a2616d..14f0424 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -189,8 +189,10 @@ QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list, } QPixmap QS60StylePrivate::part(QS60StyleEnums::SkinParts part, const QSize &size, - QS60StylePrivate::SkinElementFlags flags) + QPainter *painter, QS60StylePrivate::SkinElementFlags flags) { + Q_UNUSED(painter); + const QString partKey = QS60Style::partKeys().at(part); const QPicture partPicture = QS60StyleModeSpecifics::m_partPictures.value(partKey); QSize partSize(partPicture.boundingRect().size()); |