Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	tools/linguist/shared/profileevaluator.cpp

3 files changed, 18 insertions, 22 deletions

diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp
index 3fbf233..f60c980 100644
--- a/src/gui/styles/gtksymbols.cpp
+++ b/src/gui/styles/gtksymbols.cpp
@@ -529,14 +529,14 @@ void QGtk::applyGtkSystemPalette(QWidget *widget)
         ensureWidgetPalette(menubar, QLS("GtkMenuBar"));
     else if (QToolBar *toolbar = qobject_cast<QToolBar*> (widget))
         ensureWidgetPalette(toolbar, QLS("GtkToolbar"));
-    else if (QMenu *menubar = qobject_cast<QMenu*> (widget)) {
+    else if (QMenu *menu = qobject_cast<QMenu*> (widget)) {
         // This really applies to the combo box rendering since
         // QComboBox copies the palette from a QMenu
         QPalette pal = widget->palette();
         GdkColor gdkBg = QGtk::gtkWidget(QLS("GtkMenu"))->style->bg[GTK_STATE_NORMAL];
         QColor bgColor(gdkBg.red>>8, gdkBg.green>>8, gdkBg.blue>>8);
         pal.setBrush(QPalette::Base, bgColor);
-        menubar->setPalette(pal);
+        menu->setPalette(pal);
     }
     widget->setAttribute(Qt::WA_SetPalette, false);
 }
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 582962a..81d7cb8 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -2593,16 +2593,24 @@ void QGtkStyle::drawControl(ControlElement element,
                     opt.rect = vCheckRect;
                     drawPrimitive(PE_PanelButtonCommand, &opt, painter, widget);
                 }
-
                 painter->drawPixmap(pmr.topLeft(), pixmap);
             }
 
             GdkColor gdkText = gtkMenuItem->style->fg[GTK_STATE_NORMAL];
             GdkColor gdkDText = gtkMenuItem->style->fg[GTK_STATE_INSENSITIVE];
             GdkColor gdkHText = gtkMenuItem->style->fg[GTK_STATE_PRELIGHT];
+            uint resolve_mask = option->palette.resolve();
             QColor textColor = QColor(gdkText.red>>8, gdkText.green>>8, gdkText.blue>>8);
             QColor disabledTextColor = QColor(gdkDText.red>>8, gdkDText.green>>8, gdkDText.blue>>8);
+            if (resolve_mask & (1 << QPalette::ButtonText)) {
+                textColor = option->palette.buttonText().color();
+                disabledTextColor = option->palette.brush(QPalette::Disabled, QPalette::ButtonText);;
+            }
+
             QColor highlightedTextColor = QColor(gdkHText.red>>8, gdkHText.green>>8, gdkHText.blue>>8);
+            if (resolve_mask & (1 << QPalette::HighlightedText)) {
+                highlightedTextColor = option->palette.highlightedText().color();
+            }
 
             if (selected)
                 painter->setPen(highlightedTextColor);
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index a39eeb7..49ac57a 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -1514,20 +1514,11 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorRole fr, QPalette
 
 void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const QWidget *w, bool embedded)
 {
-#ifdef QT_NO_COMBOBOX
-    const bool isReadOnlyCombo = false;
-#else
-    const bool isReadOnlyCombo = qobject_cast<const QComboBox *>(w) != 0;
-#endif
-
     if (bg && bg->brush.style() != Qt::NoBrush) {
-        if (isReadOnlyCombo) {
-            p->setBrush(cg, QPalette::Base, bg->brush); // for windows, windowxp
-            p->setBrush(cg, QPalette::Button, bg->brush); // for plastique
-        } else {
-            p->setBrush(cg, w->backgroundRole(), bg->brush);
-            //p->setBrush(cg, QPalette::Window, bg->brush);
-        }
+        p->setBrush(cg, QPalette::Base, bg->brush); // for windows, windowxp
+        p->setBrush(cg, QPalette::Button, bg->brush); // for plastique
+        p->setBrush(cg, w->backgroundRole(), bg->brush);
+        p->setBrush(cg, QPalette::Window, bg->brush);
     }
 
     if (embedded) {
@@ -1542,12 +1533,9 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
         return;
 
     if (pal->foreground.style() != Qt::NoBrush) {
-        if (isReadOnlyCombo) {
-            p->setBrush(cg, QPalette::ButtonText, pal->foreground);
-        } else {
-            p->setBrush(cg, w->foregroundRole(), pal->foreground);
-            p->setBrush(cg, QPalette::WindowText, pal->foreground);
-        }
+        p->setBrush(cg, QPalette::ButtonText, pal->foreground);
+        p->setBrush(cg, w->foregroundRole(), pal->foreground);
+        p->setBrush(cg, QPalette::WindowText, pal->foreground);
         p->setBrush(cg, QPalette::Text, pal->foreground);
     }
     if (pal->selectionBackground.style() != Qt::NoBrush)