diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-04-27 10:38:05 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-04-28 14:42:27 (GMT) |
commit | f546d1b79d64cfad35fc4b3e5cf5db7e513e1035 (patch) | |
tree | 621dbf6109fb0fb82ad8825a00872213e34a8ecc | |
parent | 74d5d7a7d6e5433343eab38887064fc15a7c1250 (diff) | |
download | Qt-f546d1b79d64cfad35fc4b3e5cf5db7e513e1035.zip Qt-f546d1b79d64cfad35fc4b3e5cf5db7e513e1035.tar.gz Qt-f546d1b79d64cfad35fc4b3e5cf5db7e513e1035.tar.bz2 |
Fix compilation of QS60Style after bad merge.
The previous commit on this file broke compilation. It should have
called setBrush() instead of setColor() to set the Window role of the
palette to use a texture brush.
-rw-r--r-- | src/gui/styles/qs60style.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 65ce104..d7ed1e5 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -485,7 +485,7 @@ void QS60StylePrivate::setThemePalette(QWidget *widget) const QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnHighlightColors, 2, 0)); // set these as transparent so that styled full screen theme background is visible widgetPalette.setColor(QPalette::AlternateBase, Qt::transparent); - widgetPalette.setColor(QPalette::Window, QS60StylePrivate::backgroundTexture()); + widgetPalette.setBrush(QPalette::Window, QS60StylePrivate::backgroundTexture()); widgetPalette.setColor(QPalette::Base, Qt::transparent); // set button and tooltipbase based on pixel colors QColor buttonColor = colorFromFrameGraphics(QS60StylePrivate::SF_ButtonNormal); |