diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-15 08:03:03 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-15 08:03:03 (GMT) |
| commit | f9d1832c72f6717c977bafdff141225f25a3d576 (patch) | |
| tree | 8018ffd02c32028f906319dfd6a83ba46fa11c74 /src/gui | |
| parent | 659c889f64e76ec9aece2dd9e24a7f65875c46ad (diff) | |
| parent | 8a10f04c733fc774f6af972039391ec10e2d6c59 (diff) | |
| download | Qt-f9d1832c72f6717c977bafdff141225f25a3d576.zip Qt-f9d1832c72f6717c977bafdff141225f25a3d576.tar.gz Qt-f9d1832c72f6717c977bafdff141225f25a3d576.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
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); |