1 files changed, 11 insertions, 6 deletions

diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 85b65f39b1..ea653459d3 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -851,7 +851,7 @@ QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget
             info.rule = subRule;
             info.offset = offsets[where];
             info.where = where;
-            infos.append(qMove(info));
+            infos.append(std::move(info));
 
             offsets[where] += info.width;
         }
@@ -909,7 +909,7 @@ static QStyle::StandardPixmap subControlIcon(int pe)
 QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject *object)
 : features(0), hasFont(false), pal(0), b(0), bg(0), bd(0), ou(0), geo(0), p(0), img(0), clipset(0)
 {
-    QPalette palette = QApplication::palette(); // ###: ideally widget's palette
+    QPalette palette = QGuiApplication::palette(); // ###: ideally widget's palette
     ValueExtractor v(declarations, palette);
     features = v.extractStyleFeatures();
 
@@ -2734,7 +2734,7 @@ static void updateObjects(const QList<const QObject *>& objects)
     for (const QObject *object : objects) {
         if (auto widget = qobject_cast<QWidget*>(const_cast<QObject*>(object))) {
             widget->style()->polish(widget);
-            QApplication::sendEvent(widget, &event);
+            QCoreApplication::sendEvent(widget, &event);
         }
     }
 }
@@ -3446,7 +3446,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
     case CE_ToolButtonLabel:
         if (const QStyleOptionToolButton *btn = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) {
             if (rule.hasBox() || btn->features & QStyleOptionToolButton::Arrow) {
-                QCommonStyle::drawControl(ce, opt, p, w);
+                QWindowsStyle::drawControl(ce, opt, p, w);
             } else {
                 QStyleOptionToolButton butOpt(*btn);
                 rule.configurePalette(&butOpt.palette, QPalette::ButtonText, QPalette::Button);
@@ -3820,7 +3820,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
             if (subRule.hasDrawable()) {
                 subRule.drawRule(p, opt->rect);
-                QCommonStyle::drawControl(ce, &mi, p, w);
+                QCommonStyle::drawControl(ce, &mi, p, w); // deliberate bypass of the base
             } else {
                 if (rule.hasDrawable() && !(opt->state & QStyle::State_Selected)) {
                     // So that the menu bar background is not hidden by the items
@@ -4086,6 +4086,11 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             if (subRule.hasFont)
                 p->setFont(subRule.font);
             boxCopy.rect = subRule.contentsRect(opt->rect);
+            if (subRule.hasImage()) {
+                // the image is already drawn with CE_ToolBoxTabShape, adjust rect here
+                const int iconExtent = proxy()->pixelMetric(QStyle::PM_SmallIconSize, box, w);
+                boxCopy.rect.setLeft(boxCopy.rect.left() + iconExtent);
+            }
             QWindowsStyle::drawControl(ce, &boxCopy, p , w);
             if (subRule.hasFont)
                 p->setFont(oldFont);
@@ -6068,7 +6073,7 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const
         w->d_func()->directFontResolveMask = font.resolve();
 
         QEvent e(QEvent::FontChange);
-        QApplication::sendEvent(w, &e);
+        QCoreApplication::sendEvent(w, &e);
     }
 }