Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

3 files changed, 26 insertions, 19 deletions

diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index 968ca68619..ec3bb91ebf 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -2294,11 +2294,11 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
         }
         break;
     case PM_SmallIconSize:
-        ret = int(QStyleHelper::dpiScaled(16.));
+        ret = int(QStyleHelper::dpiScaled(16., opt));
         break;
 
     case PM_LargeIconSize:
-        ret = int(QStyleHelper::dpiScaled(32.));
+        ret = int(QStyleHelper::dpiScaled(32., opt));
         break;
 
     case PM_IconViewIconSize:
@@ -3899,6 +3899,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                         CGContextScaleCTM(ctx, -1, 1);
                         CGContextTranslateCTM(ctx, -frameRect.left(), 0);
                     } else if (tabDirection == QMacStylePrivate::West && tp == QStyleOptionTab::Beginning) {
+                        CGContextTranslateCTM(ctx, 0, opt->rect.top());
                         CGContextScaleCTM(ctx, 1, -1);
                         CGContextTranslateCTM(ctx, 0, -frameRect.right());
                     } else if (tabDirection == QMacStylePrivate::East && tp == QStyleOptionTab::End) {
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
index 6881ea8f16..c4ada66ca9 100644
--- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
@@ -987,7 +987,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                 XPThemeData theme(widget, 0, QWindowsXPStylePrivate::ToolBarTheme,
                                   TP_DROPDOWNBUTTON);
                 if (theme.isValid()) {
-                    const QSizeF size = theme.size() * QStyleHelper::dpiScaled(1);
+                    const QSizeF size = theme.size() * QStyleHelper::dpiScaled(1, option);
                     if (!size.isEmpty()) {
                         mbiw = qRound(size.width());
                         mbih = qRound(size.height());
@@ -2145,7 +2145,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
             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 arrowWidth = qRound(QStyleHelper::dpiScaled(16, option));
             const int arrowButtonWidth = bmarg + arrowWidth;
             const int xpos = x + wi - arrowButtonWidth;
 
@@ -2179,7 +2179,7 @@ QRect QWindowsVistaStyle::subControlRect(ComplexControl control, const QStyleOpt
             const int height = tb->rect.height();
             const int width = tb->rect.width();
             const int buttonWidth =
-                qRound(qreal(GetSystemMetrics(SM_CXSIZE)) * factor - QStyleHelper::dpiScaled(4));
+                qRound(qreal(GetSystemMetrics(SM_CXSIZE)) * factor - QStyleHelper::dpiScaled(4, option));
 
             const int frameWidth = proxy()->pixelMetric(PM_MdiSubWindowFrameWidth, option, widget);
             const bool sysmenuHint  = (tb->titleBarFlags & Qt::WindowSystemMenuHint) != 0;
@@ -2280,7 +2280,7 @@ int QWindowsVistaStyle::pixelMetric(PixelMetric metric, const QStyleOption *opti
 
     int ret = QWindowsVistaStylePrivate::fixedPixelMetric(metric);
     if (ret != QWindowsStylePrivate::InvalidMetric)
-        return int(QStyleHelper::dpiScaled(ret));
+        return int(QStyleHelper::dpiScaled(ret, option));
 
     return QWindowsXPStyle::pixelMetric(metric, option, widget);
 }
diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index a331b2ee87..e2c5bdc924 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -1486,8 +1486,9 @@ case PE_Frame:
 
                 // Inner white border
                 p->setPen(QPen(option->palette.base().color(), 0));
-                const auto topLevelAdjustment = QStyleHelper::dpiScaled(0.5);
-                const auto bottomRightAdjustment = QStyleHelper::dpiScaled(-1);
+                const qreal dpi = QStyleHelper::dpi(option);
+                const auto topLevelAdjustment = QStyleHelper::dpiScaled(0.5, dpi);
+                const auto bottomRightAdjustment = QStyleHelper::dpiScaled(-1, dpi);
                 p->drawRect(QRectF(option->rect).adjusted(topLevelAdjustment, topLevelAdjustment,
                                                           bottomRightAdjustment, bottomRightAdjustment));
                 // Outer dark border
@@ -3313,7 +3314,8 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con
         break;
 
     case PM_SplitterWidth:
-        res = qMax(int(QStyleHelper::dpiScaled(5.)), QApplication::globalStrut().width());
+        res = qMax(int(QStyleHelper::dpiScaled(5., option)),
+                   QApplication::globalStrut().width());
         break;
 
     case PM_MdiSubWindowMinimizedWidth:
@@ -3322,13 +3324,13 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con
 
 #if QT_CONFIG(toolbar)
     case PM_ToolBarHandleExtent:
-        res = int(QStyleHelper::dpiScaled(8.));
+        res = int(QStyleHelper::dpiScaled(8., option));
         break;
 
 #endif // QT_CONFIG(toolbar)
     case PM_DockWidgetSeparatorExtent:
     case PM_DockWidgetTitleMargin:
-        res = int(QStyleHelper::dpiScaled(4.));
+        res = int(QStyleHelper::dpiScaled(4., option));
         break;
 
     case PM_ButtonShiftHorizontal:
@@ -3413,7 +3415,7 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
             const bool isToolTitle = false;
             const int height = tb->rect.height();
             const int width = tb->rect.width();
-            const int buttonMargin = int(QStyleHelper::dpiScaled(4));
+            const int buttonMargin = int(QStyleHelper::dpiScaled(4, option));
             const qreal factor = QWindowsStylePrivate::nativeMetricScaleFactor(widget);
             int buttonHeight = qRound(qreal(GetSystemMetrics(SM_CYSIZE)) * factor)
                 - buttonMargin;
@@ -3524,23 +3526,27 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
     case CC_ComboBox:
         if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
             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));
+            const int xpos = x + wi - qRound(QStyleHelper::dpiScaled(1 + 16, option));
 
             switch (subControl) {
             case SC_ComboBoxFrame:
                 rect = cmb->rect;
                 break;
 
-            case SC_ComboBoxArrow:
-                rect = QRect(xpos, y + qRound(QStyleHelper::dpiScaled(1)),
-                             qRound(QStyleHelper::dpiScaled(16)), he - qRound(QStyleHelper::dpiScaled(2)));
+            case SC_ComboBoxArrow: {
+                const qreal dpi = QStyleHelper::dpi(option);
+                rect = QRect(xpos, y + qRound(QStyleHelper::dpiScaled(1, dpi)),
+                             qRound(QStyleHelper::dpiScaled(16, dpi)),
+                             he - qRound(QStyleHelper::dpiScaled(2, dpi)));
+            }
                 break;
 
             case SC_ComboBoxEditField: {
-                const int frame = qRound(QStyleHelper::dpiScaled(2));
+                const qreal dpi = QStyleHelper::dpi(option);
+                const int frame = qRound(QStyleHelper::dpiScaled(2, dpi));
                 rect = QRect(x + frame, y + frame,
-                             wi - qRound(QStyleHelper::dpiScaled(3 + 16)),
-                             he - qRound(QStyleHelper::dpiScaled(4)));
+                             wi - qRound(QStyleHelper::dpiScaled(3 + 16, dpi)),
+                             he - qRound(QStyleHelper::dpiScaled(4, dpi)));
             }
                 break;