From a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 19 Nov 2009 12:22:17 +0100
Subject: Fix QCombobox painting regression on Windows

Some style relies on this broken behaviour that was fixed in commit
e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1

The text on the combobox uses the wrong palette role.

Reviewed-by: jbache
---
 src/gui/styles/qwindowsstyle.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index f894b82..30f2f35 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -2989,7 +2989,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
 #ifndef QT_NO_COMBOBOX
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) {
-            p->save();
             QBrush editBrush = cmb->palette.brush(QPalette::Base);
             if ((cmb->subControls & SC_ComboBoxFrame)) {
                 if (cmb->frame) {
@@ -3059,7 +3058,6 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
                     proxy()->drawPrimitive(PE_FrameFocusRect, &focus, p, widget);
                 }
             }
-            p->restore();
         }
         break;
 #endif // QT_NO_COMBOBOX
-- 
cgit v0.12