diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-23 02:46:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-23 02:46:43 (GMT) |
| commit | bb2b9362ced23ff2aae824ef001efe7a34b464cc (patch) | |
| tree | 4e24e98b8d648c63f4dea134d99ea928ef37ed83 /src/gui/styles | |
| parent | db14623485396fd69839e519184b794775b65b01 (diff) | |
| parent | 7bd52a15e03b5e8e83ec1f7ae957478ed9e0cde1 (diff) | |
| download | Qt-bb2b9362ced23ff2aae824ef001efe7a34b464cc.zip Qt-bb2b9362ced23ff2aae824ef001efe7a34b464cc.tar.gz Qt-bb2b9362ced23ff2aae824ef001efe7a34b464cc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected build fail for autotests
QComboBox popup is shown in incorrect location with bottom CBA
QS60Style: The QComboBox/QSpinBox text color is not according to theme
Using TLS to store QThreadData on Symbian
Functions that are externally defined to QtOpenGL needs to be imported.
Added include for missing file for Symbian3
Support for clipboard between Qt and Symbian applications
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 50e8a5b..ca3a9d0 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -837,11 +837,8 @@ void QS60StylePrivate::setThemePaletteHash(QPalette *palette) const s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0)); QApplication::setPalette(widgetPalette, "QLineEdit"); QApplication::setPalette(widgetPalette, "QTextEdit"); - widgetPalette = *palette; - - widgetPalette.setColor(QPalette::HighlightedText, - s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0)); QApplication::setPalette(widgetPalette, "QComboBox"); + QApplication::setPalette(widgetPalette, "QSpinBox"); widgetPalette = *palette; widgetPalette.setColor(QPalette::WindowText, s60Color(QS60StyleEnums::CL_QsnTextColors, 7, 0)); |