diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-12 23:00:14 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-12 23:00:14 (GMT) |
| commit | 8a10f04c733fc774f6af972039391ec10e2d6c59 (patch) | |
| tree | efc6fb305ccbedb720991a80a39e261af1e3aa6b /src/gui | |
| parent | 8f23788ec21896135f182778cf48362162b88969 (diff) | |
| parent | e61071a2a170eaeb524778e9e903100323b88bbe (diff) | |
| download | Qt-8a10f04c733fc774f6af972039391ec10e2d6c59.zip Qt-8a10f04c733fc774f6af972039391ec10e2d6c59.tar.gz Qt-8a10f04c733fc774f6af972039391ec10e2d6c59.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui')
| -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 5e5adab..5fe9050 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -723,7 +723,7 @@ void QS60StylePrivate::setThemePalette(QPalette *palette) const palette->setBrush(QPalette::Base, Qt::transparent); // set button color based on pixel colors #ifndef Q_WS_S60 - //For emulated style, just calculate the color everytime + //For emulated style, just calculate the color every time const QColor buttonColor = calculatedColor(SF_ButtonNormal); #else const QColor buttonColor = colorFromFrameGraphics(SF_ButtonNormal); |