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

 Conflicts:
	src/corelib/tools/qvarlengtharray.qdoc
	src/corelib/tools/qvector.qdoc

Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.

Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79

4 files changed, 97 insertions, 67 deletions

diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index 1041187407..10fe3f6f0e 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -237,6 +237,19 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QIndeterminateProgressIndicator);
 
 @end
 
+@interface QT_MANGLE_NAMESPACE(QVerticalSplitView) : NSSplitView
+- (BOOL)isVertical;
+@end
+
+QT_NAMESPACE_ALIAS_OBJC_CLASS(QVerticalSplitView);
+
+@implementation QVerticalSplitView
+- (BOOL)isVertical
+{
+    return YES;
+}
+@end
+
 QT_BEGIN_NAMESPACE
 
 // The following constants are used for adjusting the size
@@ -2002,6 +2015,15 @@ NSView *QMacStylePrivate::cocoaControl(CocoaControl widget) const
             // at construction time, and it cannot be changed later.
             bv = [[NSSlider alloc] initWithFrame:NSMakeRect(0, 0, 20, 200)];
             break;
+        case SplitView_Horizontal:
+            bv = [[NSSplitView alloc] init];
+            break;
+        case SplitView_Vertical:
+            bv = [[QVerticalSplitView alloc] init];
+            break;
+        case TextField:
+            bv = [[NSTextField alloc] init];
+            break;
         default:
             break;
         }
@@ -2076,7 +2098,7 @@ NSCell *QMacStylePrivate::cocoaCell(CocoaControl widget) const
     return cell;
 }
 
-void QMacStylePrivate::drawNSViewInRect(CocoaControl widget, NSView *view, const QRect &qtRect, QPainter *p, bool isQWidget, DrawRectBlock drawRectBlock) const
+void QMacStylePrivate::drawNSViewInRect(CocoaControl widget, NSView *view, const QRect &qtRect, QPainter *p, bool isQWidget, __attribute__((noescape)) DrawRectBlock drawRectBlock) const
 {
     QPoint offset;
     if (widget == CocoaControl(Button_PopupButton, QStyleHelper::SizeSmall))
@@ -3444,35 +3466,21 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
     case PE_FrameLineEdit:
         if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(opt)) {
             if (frame->state & State_Sunken) {
-                QColor baseColor(frame->palette.background().color());
-                HIThemeFrameDrawInfo fdi;
-                fdi.version = qt_mac_hitheme_version;
-                fdi.state = tds;
-                int frame_size;
-                fdi.kind = frame->features & QStyleOptionFrame::Rounded ? kHIThemeFrameTextFieldRound :
-                                                                          kHIThemeFrameTextFieldSquare;
-                frame_size = qt_mac_aqua_get_metric(EditTextFrameOutset);
-                if ((frame->state & State_ReadOnly) || !(frame->state & State_Enabled))
-                    fdi.state = kThemeStateInactive;
-                else if (fdi.state == kThemeStatePressed)
-                    // This pressed state doesn't make sense for a line edit frame.
-                    // And Yosemite agrees with us. Otherwise it starts showing yellow pixels.
-                    fdi.state = kThemeStateActive;
-                fdi.isFocused = (frame->state & State_HasFocus);
-                int lw = frame->lineWidth;
-                if (lw <= 0)
-                    lw = proxy()->pixelMetric(PM_DefaultFrameWidth, frame, w);
-                { //clear to base color
-                    p->save();
-                    p->setPen(QPen(baseColor, lw));
-                    p->setBrush(Qt::NoBrush);
-                    p->drawRect(frame->rect);
-                    p->restore();
-                }
-                const auto frameMargins = QMargins(frame_size, frame_size, frame_size, frame_size);
-                const CGRect cgRect = frame->rect.marginsRemoved(frameMargins).toCGRect();
-
-                HIThemeDrawFrame(&cgRect, &fdi, cg, kHIThemeOrientationNormal);
+                const bool isEnabled = opt->state & State_Enabled;
+                const bool isReadOnly = opt->state & State_ReadOnly;
+                const bool isRounded = frame->features & QStyleOptionFrame::Rounded;
+                const auto cs = d->effectiveAquaSizeConstrain(opt, w, CT_LineEdit);
+                const auto cw = QMacStylePrivate::CocoaControl(QMacStylePrivate::TextField, cs);
+                auto *tf = static_cast<NSTextField *>(d->cocoaControl(cw));
+                tf.enabled = isEnabled;
+                tf.editable = !isReadOnly;
+                tf.bezeled = YES;
+                static_cast<NSTextFieldCell *>(tf.cell).bezelStyle = isRounded ? NSTextFieldRoundedBezel : NSTextFieldSquareBezel;
+                tf.frame = opt->rect.toCGRect();
+                d->drawNSViewInRect(cw, tf, opt->rect, p, w != nullptr, ^(CGContextRef ctx, const CGRect &rect) {
+                    Q_UNUSED(ctx);
+                    [tf.cell drawWithFrame:rect inView:tf];
+                });
             } else {
                 QCommonStyle::drawPrimitive(pe, opt, p, w);
             }
@@ -4498,13 +4506,16 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
         break;
         }
     case CE_Splitter:
-        if (opt->rect.width() > 1 && opt->rect.height() > 1){
-            HIThemeSplitterDrawInfo sdi;
-            sdi.version = qt_mac_hitheme_version;
-            sdi.state = tds;
-            sdi.adornment = kHIThemeSplitterAdornmentMetal;
-            CGRect cgRect = opt->rect.toCGRect();
-            HIThemeDrawPaneSplitter(&cgRect, &sdi, cg, kHIThemeOrientationNormal);
+        if (opt->rect.width() > 1 && opt->rect.height() > 1) {
+            const bool isVertical = !(opt->state & QStyle::State_Horizontal);
+            // Qt refers to the layout orientation, while Cocoa refers to the divider's.
+            const auto ct = isVertical ? QMacStylePrivate::SplitView_Horizontal : QMacStylePrivate::SplitView_Vertical;
+            const auto cw = QMacStylePrivate::CocoaControl(ct, QStyleHelper::SizeLarge);
+            auto *sv = static_cast<NSSplitView *>(d->cocoaControl(cw));
+            sv.frame = opt->rect.toCGRect();
+            d->drawNSViewInRect(cw, sv, opt->rect, p, w != nullptr, ^(CGContextRef ctx, const CGRect &rect) {
+                [sv drawDividerInRect:rect];
+            });
         } else {
             QPen oldPen = p->pen();
             p->setPen(opt->palette.dark().color());
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
index cf2609e9ec..00dc8a9b53 100644
--- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@@ -200,7 +200,10 @@ public:
         Scroller_Vertical,
         Slider_Horizontal,
         Slider_Vertical,
-        Stepper       // QSpinBox buttons
+        SplitView_Horizontal,
+        SplitView_Vertical,
+        Stepper,      // QSpinBox buttons
+        TextField
     };
 
     typedef QPair<CocoaControlType, QStyleHelper::WidgetSizePolicy> CocoaControl;
@@ -270,7 +273,7 @@ public:
 
     void setupVerticalInvertedXform(CGContextRef cg, bool reverse, bool vertical, const CGRect &rect) const;
 
-    void drawNSViewInRect(CocoaControl widget, NSView *view, const QRect &rect, QPainter *p, bool isQWidget = true, DrawRectBlock drawRectBlock = nil) const;
+    void drawNSViewInRect(CocoaControl widget, NSView *view, const QRect &rect, QPainter *p, bool isQWidget = true, __attribute__((noescape)) DrawRectBlock drawRectBlock = nil) const;
     void resolveCurrentNSView(QWindow *window) const;
 
     void drawFocusRing(QPainter *p, const QRect &targetRect, int hMargin, int vMargin, qreal radius = 0) const;
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
index 078875033f..6add110249 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
@@ -990,7 +990,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                 XPThemeData theme(widget, 0, QWindowsXPStylePrivate::ToolBarTheme,
                                   TP_DROPDOWNBUTTON);
                 if (theme.isValid()) {
-                    const QSizeF size = theme.size() * QWindowsStylePrivate::nativeMetricScaleFactor(widget);
+                    const QSizeF size = theme.size() * QStyleHelper::dpiScaled(1);
                     if (!size.isEmpty()) {
                         mbiw = qRound(size.width());
                         mbih = qRound(size.height());
@@ -1513,7 +1513,7 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
     if (d->transitionsEnabled() && canAnimate(option))
     {
 
-        if (control == CC_ScrollBar || control == CC_SpinBox ) {
+        if (control == CC_ScrollBar || control == CC_SpinBox || control == CC_ComboBox) {
 
             QObject *styleObject = option->styleObject; // Can be widget or qquickitem
 
@@ -1643,12 +1643,28 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
 
             } else {
                 if (sub & SC_ComboBoxFrame) {
-                    QStyleOptionButton btn;
-                    btn.QStyleOption::operator=(*option);
-                    btn.rect = option->rect.adjusted(-1, -1, 1, 1);
-                    if (sub & SC_ComboBoxArrow)
-                        btn.features = QStyleOptionButton::HasMenu;
-                    proxy()->drawControl(QStyle::CE_PushButton, &btn, painter, widget);
+                    XPThemeData theme(widget, painter, QWindowsXPStylePrivate::ComboboxTheme);
+                    theme.rect = option->rect;
+                    theme.partId = CP_READONLY;
+                    if (!(cmb->state & State_Enabled))
+                        theme.stateId = CBXS_DISABLED;
+                    else if (cmb->state & State_Sunken || cmb->state & State_On)
+                        theme.stateId = CBXS_PRESSED;
+                    else if (cmb->state & State_MouseOver)
+                        theme.stateId = CBXS_HOT;
+                    else
+                        theme.stateId = CBXS_NORMAL;
+                    d->drawBackground(theme);
+                }
+                if (sub & SC_ComboBoxArrow) {
+                    XPThemeData theme(widget, painter, QWindowsXPStylePrivate::ComboboxTheme);
+                    theme.rect = proxy()->subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget);
+                    theme.partId = option->direction == Qt::RightToLeft ? CP_DROPDOWNBUTTONLEFT : CP_DROPDOWNBUTTONRIGHT;
+                    if (!(cmb->state & State_Enabled))
+                        theme.stateId = CBXS_DISABLED;
+                    else
+                        theme.stateId = CBXS_NORMAL;
+                    d->drawBackground(theme);
                 }
             }
        }
@@ -2123,15 +2139,12 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
 #if QT_CONFIG(combobox)
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
-            int x = cb->rect.x(),
-                y = cb->rect.y(),
-                wi = cb->rect.width(),
-                he = cb->rect.height();
-            int xpos = x;
-            int margin = cb->frame ? 3 : 0;
-            int bmarg = cb->frame ? 2 : 0;
-            int arrowButtonWidth = bmarg + 16;
-            xpos += wi - arrowButtonWidth;
+            const int x = cb->rect.x(), y = cb->rect.y(), wi = cb->rect.width(), he = cb->rect.height();
+            const int margin = cb->frame ? 3 : 0;
+            const int bmarg = cb->frame ? 2 : 0;
+            const int arrowWidth = qRound(QStyleHelper::dpiScaled(16));
+            const int arrowButtonWidth = bmarg + arrowWidth;
+            const int xpos = x + wi - arrowButtonWidth;
 
             switch (subControl) {
             case SC_ComboBoxFrame:
@@ -2141,7 +2154,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
                 rect.setRect(xpos, y , arrowButtonWidth, he);
                 break;
             case SC_ComboBoxEditField:
-                rect.setRect(x + margin, y + margin, wi - 2 * margin - 16, he - 2 * margin);
+                rect.setRect(x + margin, y + margin, wi - 2 * margin - arrowWidth, he - 2 * margin);
                 break;
             case SC_ComboBoxListBoxPopup:
                 rect = cb->rect;
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index cf344c8f88..ff27cab98a 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -887,6 +887,7 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
         PROPERTYORIGIN origin = PO_NOTFOUND;
         GetThemePropertyOrigin(themeData.handle(), themeData.partId, themeData.stateId, TMT_BORDERSIZE, &origin);
         GetThemeInt(themeData.handle(), themeData.partId, themeData.stateId, TMT_BORDERSIZE, &borderSize);
+        borderSize *= additionalDevicePixelRatio;
 
         // Clip away border region
         if ((origin == PO_CLASS || origin == PO_PART || origin == PO_STATE) && borderSize > 0) {
@@ -996,7 +997,7 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
     }
 
     if (addBorderContentClipping)
-        painter->setClipRegion(extraClip, Qt::IntersectClip);
+        painter->setClipRegion(scaleRegion(extraClip, 1.0 / additionalDevicePixelRatio), Qt::IntersectClip);
 
     if (!themeData.mirrorHorizontally && !themeData.mirrorVertically && !themeData.rotate) {
         if (!haveCachedPixmap)
@@ -1479,11 +1480,12 @@ case PE_Frame:
                 // GetThemeInt(theme.handle(), partId, stateId, TMT_BORDERCOLOR, &borderSize);
 
                 // Inner white border
-                p->setPen(QPen(option->palette.base().color(), 1));
-                p->drawRect(option->rect.adjusted(1, 1, -2, -2));
+                p->setPen(QPen(option->palette.base().color(), 0));
+                p->drawRect(QRectF(option->rect).adjusted(QStyleHelper::dpiScaled(0.5), QStyleHelper::dpiScaled(0.5),
+                                                          QStyleHelper::dpiScaled(-1), QStyleHelper::dpiScaled(-1)));
                 // Outer dark border
-                p->setPen(QPen(bordercolor, 1));
-                p->drawRect(option->rect.adjusted(0, 0, -1, -1));
+                p->setPen(QPen(bordercolor, 0));
+                p->drawRect(QRectF(option->rect).adjusted(0, 0, QStyleHelper::dpiScaled(-0.5), QStyleHelper::dpiScaled(-0.5)));
                 p->setPen(oldPen);
                 return;
             } else if (fillType == BT_NONE) {
@@ -3511,9 +3513,8 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
 
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
-            int x = cmb->rect.x(), y = cmb->rect.y(), wi = cmb->rect.width(), he = cmb->rect.height();
-            int xpos = x;
-            xpos += wi - 1 - 16;
+            const int x = cmb->rect.x(), y = cmb->rect.y(), wi = cmb->rect.width(), he = cmb->rect.height();
+            const int xpos = x + wi - qRound(QStyleHelper::dpiScaled(1 + 16));
 
             switch (subControl) {
             case SC_ComboBoxFrame:
@@ -3521,11 +3522,13 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
                 break;
 
             case SC_ComboBoxArrow:
-                rect = QRect(xpos, y+1, 16, he-2);
+                rect = QRect(xpos, y + qRound(QStyleHelper::dpiScaled(1)),
+                             qRound(QStyleHelper::dpiScaled(16)), he - qRound(QStyleHelper::dpiScaled(2)));
                 break;
 
             case SC_ComboBoxEditField:
-                rect = QRect(x+2, y+2, wi-3-16, he-4);
+                rect = QRect(x + qRound(QStyleHelper::dpiScaled(2)), y + qRound(QStyleHelper::dpiScaled(2)),
+                             wi - qRound(QStyleHelper::dpiScaled(3 + 16)), he - qRound(QStyleHelper::dpiScaled(4)));
                 break;
 
             case SC_ComboBoxListBoxPopup: