Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/tools/qhash.h
	src/gui/kernel/qevent.h
	src/widgets/kernel/qshortcut.cpp
	src/widgets/kernel/qshortcut.h

Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620

5 files changed, 46 insertions, 27 deletions

diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 271b43fe89..861dd7a54c 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -5143,7 +5143,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
 
     case SH_Table_GridLineColor:
         if (opt)
-            ret = opt->palette.color(QPalette::Mid).rgb();
+            ret = opt->palette.color(QPalette::Mid).rgba();
         else
             ret = -1;
         break;
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 54bf1d0691..a732d59e48 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -3733,7 +3733,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
         return 0;
 
     case SH_Table_GridLineColor:
-        return option ? option->palette.window().color().darker(120).rgb() : 0;
+        return option ? option->palette.window().color().darker(120).rgba() : 0;
 
     case SH_MessageBox_TextInteractionFlags:
         return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index ca81be1b2b..e462d0696b 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -1834,7 +1834,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value SH_LineEdit_PasswordMaskDelay  Determines the delay before visible character is masked
     with password character, in milliseconds. This enum value was added in Qt 5.4.
 
-    \value SH_Table_GridLineColor The RGB value of the grid for a table.
+    \value SH_Table_GridLineColor The RGBA value of the grid for a table.
 
     \value SH_UnderlineShortcut  Whether shortcuts are underlined.
 
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 564c6cad00..110ebf29c9 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -2909,7 +2909,7 @@ QStyleOptionRubberBand::QStyleOptionRubberBand(int version)
 */
 
 QStyleOptionTitleBar::QStyleOptionTitleBar()
-    : QStyleOptionComplex(Version, SO_TitleBar), titleBarState(0), titleBarFlags(0)
+    : QStyleOptionComplex(Version, SO_TitleBar), titleBarState(0)
 {
 }
 
@@ -2954,7 +2954,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar()
     \internal
 */
 QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
-    : QStyleOptionComplex(version, SO_TitleBar), titleBarState(0), titleBarFlags(0)
+    : QStyleOptionComplex(version, SO_TitleBar), titleBarState(0)
 {
 }
 
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 3f57992311..24a397a274 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -479,7 +479,7 @@ struct QStyleSheetGeometryData : public QSharedData
 
 struct QStyleSheetPositionData : public QSharedData
 {
-    QStyleSheetPositionData(int l, int t, int r, int b, Origin o, Qt::Alignment p, QCss::PositionMode m, Qt::Alignment a = 0)
+    QStyleSheetPositionData(int l, int t, int r, int b, Origin o, Qt::Alignment p, QCss::PositionMode m, Qt::Alignment a = { })
         : left(l), top(t), bottom(b), right(r), origin(o), position(p), mode(m), textAlignment(a) { }
 
     int left, top, bottom, right;
@@ -534,6 +534,7 @@ public:
     const QStyleSheetOutlineData *outline() const { return ou; }
     const QStyleSheetGeometryData *geometry() const { return geo; }
     const QStyleSheetPositionData *position() const { return p; }
+    const QStyleSheetImageData *icon() const { return iconPtr; }
 
     bool hasModification() const;
 
@@ -569,6 +570,7 @@ public:
     bool hasGeometry() const { return geo != 0; }
     bool hasDrawable() const { return !hasNativeBorder() || hasBackground() || hasImage(); }
     bool hasImage() const { return img != 0; }
+    bool hasIcon() const { return iconPtr != 0; }
 
     QSize minimumContentsSize() const
     { return geo ? QSize(geo->minWidth, geo->minHeight) : QSize(0, 0); }
@@ -628,6 +630,7 @@ public:
     QSharedDataPointer<QStyleSheetGeometryData> geo;
     QSharedDataPointer<QStyleSheetPositionData> p;
     QSharedDataPointer<QStyleSheetImageData> img;
+    QSharedDataPointer<QStyleSheetImageData> iconPtr;
 
     int clipset;
     QPainterPath clipPath;
@@ -919,9 +922,9 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject
 
     int left = 0, top = 0, right = 0, bottom = 0;
     Origin origin = Origin_Unknown;
-    Qt::Alignment position = 0;
+    Qt::Alignment position;
     QCss::PositionMode mode = PositionMode_Unknown;
-    Qt::Alignment textAlignment = 0;
+    Qt::Alignment textAlignment;
     if (v.extractPosition(&left, &top, &right, &bottom, &origin, &position, &mode, &textAlignment))
         p = new QStyleSheetPositionData(left, top, right, bottom, origin, position, mode, textAlignment);
 
@@ -969,11 +972,16 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QObject
     if (v.extractPalette(&fg, &sfg, &sbg, &abg))
         pal = new QStyleSheetPaletteData(fg, sfg, sbg, abg);
 
-    QIcon icon;
+    QIcon imgIcon;
     alignment = Qt::AlignCenter;
+    QSize imgSize;
+    if (v.extractImage(&imgIcon, &alignment, &imgSize))
+        img = new QStyleSheetImageData(imgIcon, alignment, imgSize);
+
+    QIcon icon;
     QSize size;
-    if (v.extractImage(&icon, &alignment, &size))
-        img = new QStyleSheetImageData(icon, alignment, size);
+    if (v.extractIcon(&icon, &size))
+        iconPtr = new QStyleSheetImageData(icon, Qt::AlignCenter, size);
 
     int adj = -255;
     hasFont = v.extractFont(&font, &adj);
@@ -2223,7 +2231,7 @@ static Qt::Alignment defaultPosition(int pe)
         return Qt::AlignRight | Qt::AlignVCenter;
 
     default:
-        return 0;
+        return { };
     }
 }
 
@@ -3333,7 +3341,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
                 layout = subControlLayout(QLatin1String("mNX"));
 
             QStyleOptionComplex optCopy(*opt);
-            optCopy.subControls = 0;
+            optCopy.subControls = { };
             for (int i = 0; i < layout.count(); i++) {
                 int layoutButton = layout[i].toInt();
                 if (layoutButton < PseudoElement_MdiCloseButton
@@ -3521,15 +3529,25 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
             if (rule.hasFont)
                 p->setFont(rule.font.resolve(p->font()));
 
-            if (rule.hasPosition() && rule.position()->textAlignment != 0) {
-                Qt::Alignment textAlignment = rule.position()->textAlignment;
-                QRect textRect = button->rect;
+            if (rule.hasPosition() || rule.hasIcon()) {
                 uint tf = Qt::TextShowMnemonic;
+                QRect textRect = button->rect;
+
+                const uint horizontalAlignMask = Qt::AlignHCenter | Qt::AlignLeft | Qt::AlignRight;
                 const uint verticalAlignMask = Qt::AlignVCenter | Qt::AlignTop | Qt::AlignLeft;
-                tf |= (textAlignment & verticalAlignMask) ? (textAlignment & verticalAlignMask) : Qt::AlignVCenter;
-                if (!styleHint(SH_UnderlineShortcut, button, w))
-                    tf |= Qt::TextHideMnemonic;
-                if (!button->icon.isNull()) {
+
+                if (rule.hasPosition() && rule.position()->textAlignment != 0) {
+                    Qt::Alignment textAlignment = rule.position()->textAlignment;
+                    tf |= (textAlignment & verticalAlignMask) ? (textAlignment & verticalAlignMask) : Qt::AlignVCenter;
+                    tf |= (textAlignment & horizontalAlignMask) ? (textAlignment & horizontalAlignMask) : Qt::AlignHCenter;
+                    if (!styleHint(SH_UnderlineShortcut, button, w))
+                        tf |= Qt::TextHideMnemonic;
+                } else {
+                    tf |= Qt::AlignVCenter | Qt::AlignHCenter;
+                }
+
+                QIcon icon = rule.hasIcon() ? rule.icon()->icon : button->icon;
+                if (!icon.isNull()) {
                     //Group both icon and text
                     QRect iconRect;
                     QIcon::Mode mode = button->state & State_Enabled ? QIcon::Normal : QIcon::Disabled;
@@ -3539,7 +3557,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                     if (button->state & State_On)
                         state = QIcon::On;
 
-                    QPixmap pixmap = button->icon.pixmap(button->iconSize, mode, state);
+                    QPixmap pixmap = icon.pixmap(button->iconSize, mode, state);
                     int pixmapWidth = pixmap.width() / pixmap.devicePixelRatio();
                     int pixmapHeight = pixmap.height() / pixmap.devicePixelRatio();
                     int labelWidth = pixmapWidth;
@@ -3550,10 +3568,10 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                         labelWidth += (textWidth + iconSpacing);
 
                     //Determine label alignment:
-                    if (textAlignment & Qt::AlignLeft) { /*left*/
+                    if (tf & Qt::AlignLeft) { /*left*/
                         iconRect = QRect(textRect.x(), textRect.y() + (textRect.height() - labelHeight) / 2,
                                          pixmapWidth, pixmapHeight);
-                    } else if (textAlignment & Qt::AlignHCenter) { /* center */
+                    } else if (tf & Qt::AlignHCenter) { /* center */
                         iconRect = QRect(textRect.x() + (textRect.width() - labelWidth) / 2,
                                          textRect.y() + (textRect.height() - labelHeight) / 2,
                                          pixmapWidth, pixmapHeight);
@@ -3565,7 +3583,9 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
                     iconRect = visualRect(button->direction, textRect, iconRect);
 
-                    tf |= Qt::AlignLeft; //left align, we adjust the text-rect instead
+                    // Left align, adjust the text-rect according to the icon instead
+                    tf &= ~horizontalAlignMask;
+                    tf |= Qt::AlignLeft;
 
                     if (button->direction == Qt::RightToLeft)
                         textRect.setRight(iconRect.left() - iconSpacing);
@@ -3576,9 +3596,8 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                         iconRect.translate(pixelMetric(PM_ButtonShiftHorizontal, opt, w),
                                            pixelMetric(PM_ButtonShiftVertical, opt, w));
                     p->drawPixmap(iconRect, pixmap);
-                } else {
-                    tf |= textAlignment;
                 }
+
                 if (button->state & (State_On | State_Sunken))
                     textRect.translate(pixelMetric(PM_ButtonShiftHorizontal, opt, w),
                                  pixelMetric(PM_ButtonShiftVertical, opt, w));
@@ -4223,7 +4242,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
                 }
                 r = subRule.contentsRect(r);
 
-                Qt::Alignment alignment = 0;
+                Qt::Alignment alignment;
                 if (subRule.hasPosition())
                     alignment = subRule.position()->textAlignment;
                 if (alignment == 0)