summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-04-06 12:17:15 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-04-06 12:19:48 (GMT)
commitf06c4f2d7378b40a0a184393a8986032d5a700ee (patch)
tree1ec9acc80ac8082b2de8891c1bf264da6af75417 /src/gui/kernel
parentcc18633fe45d599bfeac2a8b2737d155f1dd5564 (diff)
downloadQt-f06c4f2d7378b40a0a184393a8986032d5a700ee.zip
Qt-f06c4f2d7378b40a0a184393a8986032d5a700ee.tar.gz
Qt-f06c4f2d7378b40a0a184393a8986032d5a700ee.tar.bz2
BT: Fix combobox background color regression
There was a regression in the background color for QComboBox popups. This should resolve it. It essentially tells the system to stay off the system palette while QGtkStyle is used. We will introduce a cleaner style hint for this in 4.6. Reviewed-by: nrc
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication_x11.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 10fb886..b1270bc 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -1362,8 +1362,10 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0,
pal.setColor(QPalette::Disabled, QPalette::Highlight, Qt::darkBlue);
}
- QApplicationPrivate::setSystemPalette(pal);
-
+ // QGtkStyle sets it's own system palette
+ if (!(QApplicationPrivate::app_style && QApplicationPrivate::app_style->inherits("QGtkStyle"))) {
+ QApplicationPrivate::setSystemPalette(pal);
+ }
QColor::setAllowX11ColorNames(allowX11ColorNames);
}