4 files changed, 29 insertions, 13 deletions
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
index 0236669d6fb..23bbe409caa 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -450,6 +450,26 @@ QPixmap QWindowsScreen::grabWindow(WId window, int xIn, int yIn, int width, int
         hwnd = GetDesktopWindow();
         const QRect screenGeometry = geometry();
         windowSize = screenGeometry.size();
+        // When dpi awareness is not set to PerMonitor, windows reports primary display or dummy
+        // DPI for all displays, so xIn and yIn and windowSize are calculated with a wrong DPI,
+        // so we need to recalculate them using the actual screen size we get from
+        // EnumDisplaySettings api.
+        const auto dpiAwareness = QWindowsContext::instance()->processDpiAwareness();
+        if (dpiAwareness != QtWindows::DpiAwareness::PerMonitor &&
+            dpiAwareness != QtWindows::DpiAwareness::PerMonitorVersion2) {
+            MONITORINFOEX info = {};
+            info.cbSize = sizeof(MONITORINFOEX);
+            if (GetMonitorInfo(handle(), &info)) {
+                DEVMODE dm = {};
+                dm.dmSize = sizeof(dm);
+                if (EnumDisplaySettings(info.szDevice, ENUM_CURRENT_SETTINGS, &dm)) {
+                    qreal scale = static_cast<qreal>(dm.dmPelsWidth) / windowSize.width();
+                    x = static_cast<int>(static_cast<qreal>(x) * scale);
+                    y = static_cast<int>(static_cast<qreal>(y) * scale);
+                    windowSize = QSize(dm.dmPelsWidth, dm.dmPelsHeight);
+                }
+            }
+        }
         x += screenGeometry.x();
         y += screenGeometry.y();
     }
diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf
index be788d10f8e..846c4f3b923 100644
--- a/src/plugins/sqldrivers/.cmake.conf
+++ b/src/plugins/sqldrivers/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.11.0")
+set(QT_REPO_MODULE_VERSION "6.12.0")
diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index ff2d4bd845f..e9b90d787bc 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -596,7 +596,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
             if (sub & SC_ComboBoxArrow) {
                 QRectF rect = proxy()->subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget);
                 painter->setFont(d->assetFont);
-                painter->setPen(controlTextColor(option));
+                painter->setPen(controlTextColor(option, true));
                 painter->drawText(rect, Qt::AlignCenter, fluentIcon(Icon::ChevronDownMed));
             }
             if (state & State_KeyboardFocusChange && hasFocus) {
@@ -887,7 +887,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
 
             if (isOn) {
                 painter->setFont(d->assetFont);
-                painter->setPen(controlTextColor(option, QPalette::Window));
+                painter->setPen(controlTextColor(option));
                 qreal clipWidth = 1.0;
                 const QString str = fluentIcon(Icon::AcceptMedium);
                 QFontMetrics fm(d->assetFont);
@@ -907,7 +907,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
                 QFont f(d->assetFont);
                 f.setPointSize(6);
                 painter->setFont(f);
-                painter->setPen(controlTextColor(option, QPalette::Window));
+                painter->setPen(controlTextColor(option));
                 painter->drawText(rect, Qt::AlignCenter, fluentIcon(Icon::Dash12));
             }
         }
@@ -1214,7 +1214,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
     case QStyle::CE_ComboBoxLabel:
 #if QT_CONFIG(combobox)
         if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
-            painter->setPen(controlTextColor(option));
+            painter->setPen(controlTextColor(option, true));
             QStyleOptionComboBox newOption = *cb;
             newOption.rect.adjust(4,0,-4,0);
             QCommonStyle::drawControl(element, &newOption, painter, widget);
@@ -2737,7 +2737,7 @@ QBrush QWindows11Style::inputFillBrush(const QStyleOption *option, const QWidget
     return winUI3Color(fillControlDefault);
 }
 
-QColor QWindows11Style::controlTextColor(const QStyleOption *option, QPalette::ColorRole role) const
+QColor QWindows11Style::controlTextColor(const QStyleOption *option, bool ignoreIsChecked) const
 {
     using namespace StyleOptionHelper;
     static constexpr WINUI3Color colorEnums[2][4] = {
@@ -2750,12 +2750,9 @@ QColor QWindows11Style::controlTextColor(const QStyleOption *option, QPalette::C
     if (option->palette.isBrushSet(QPalette::Current, QPalette::ButtonText))
         return option->palette.buttonText().color();
 
-    const int colorIndex = isChecked(option) ? 1 : 0;
+    const int colorIndex = !ignoreIsChecked && isChecked(option) ? 1 : 0;
     const auto state = calcControlState(option);
-    const auto alpha = winUI3Color(colorEnums[colorIndex][int(state)]);
-    QColor col = option->palette.color(role);
-    col.setAlpha(alpha.alpha());
-    return col;
+    return winUI3Color(colorEnums[colorIndex][int(state)]);
 }
 
 void QWindows11Style::drawLineEditFrame(QPainter *p, const QRectF &rect, const QStyleOption *o, bool isEditable) const
diff --git a/src/plugins/styles/modernwindows/qwindows11style_p.h b/src/plugins/styles/modernwindows/qwindows11style_p.h
index 96c2c4136e0..9d0cdda3e33 100644
--- a/src/plugins/styles/modernwindows/qwindows11style_p.h
+++ b/src/plugins/styles/modernwindows/qwindows11style_p.h
@@ -104,8 +104,7 @@ private:
     QBrush controlFillBrush(const QStyleOption *option, ControlType controlType) const;
     QBrush inputFillBrush(const QStyleOption *option, const QWidget *widget) const;
     // ControlType::ControlAlt can be mapped to QPalette directly
-    QColor controlTextColor(const QStyleOption *option,
-                            QPalette::ColorRole role = QPalette::ButtonText) const;
+    QColor controlTextColor(const QStyleOption *option, bool ignoreIsChecked = false) const;
     void drawLineEditFrame(QPainter *p, const QRectF &rect, const QStyleOption *o, bool isEditable = true) const;
     inline QColor winUI3Color(enum WINUI3Color col) const;