summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-04-02 11:19:42 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-04-02 11:23:17 (GMT)
commitca582d6cb205461cfcdf448749b46ee654faa5fd (patch)
tree1228bd1cc9f68f3ea578818bf8a60c8351938f46 /src/gui/widgets
parente008504b5ec34975e34adf3b1a2b7170d0e4dd38 (diff)
downloadQt-ca582d6cb205461cfcdf448749b46ee654faa5fd.zip
Qt-ca582d6cb205461cfcdf448749b46ee654faa5fd.tar.gz
Qt-ca582d6cb205461cfcdf448749b46ee654faa5fd.tar.bz2
Improved stylesheet support for setting background and foreground roles
This makes sure that style sheets set both ButtonText and WindowText roles for all widgets. This fixes among other things the fact that you could not configure text colors for combo box popups on Mac, Gtk and CleanLooks or set the background for the whole scrollbar. Task-number: 160713 Reviewed-by: ogoffart
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qcombobox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index c7e2590..09a51fe 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -109,7 +109,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
const QModelIndex &index) const
{
QStyleOptionMenuItem menuOption;
- menuOption.palette = QComboBoxPrivate::viewContainerPalette(mCombo).resolve(QApplication::palette("QMenu"));
+ menuOption.palette = option.palette.resolve(QApplication::palette("QMenu"));
menuOption.state = QStyle::State_None;
if (mCombo->window()->isActiveWindow())
menuOption.state = QStyle::State_Active;