1 files changed, 32 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 17e8cffb76..19de3d5939 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -50,6 +50,7 @@
 #include <QtGui/qscreen.h>
 #include <QtGui/private/qguiapplication_p.h> // getPixmapCursor()
 #include <QtGui/private/qhighdpiscaling_p.h>
+#include <QtCore/private/qwinregistry_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qscopedpointer.h>
@@ -79,10 +80,10 @@ QWindowsPixmapCursorCacheKey::QWindowsPixmapCursorCacheKey(const QCursor &c)
     : bitmapCacheKey(c.pixmap().cacheKey()), maskCacheKey(0)
 {
     if (!bitmapCacheKey) {
-        Q_ASSERT(c.bitmap());
-        Q_ASSERT(c.mask());
-        bitmapCacheKey = c.bitmap()->cacheKey();
-        maskCacheKey = c.mask()->cacheKey();
+        Q_ASSERT(!c.bitmap(Qt::ReturnByValue).isNull());
+        Q_ASSERT(!c.mask(Qt::ReturnByValue).isNull());
+        bitmapCacheKey = c.bitmap(Qt::ReturnByValue).cacheKey();
+        maskCacheKey = c.mask(Qt::ReturnByValue).cacheKey();
     }
 }
 
@@ -168,9 +169,9 @@ static HCURSOR createBitmapCursor(const QImage &bbits, const QImage &mbits,
 // Create a cursor from image and mask of the format QImage::Format_Mono.
 static HCURSOR createBitmapCursor(const QCursor &cursor, qreal scaleFactor = 1)
 {
-    Q_ASSERT(cursor.shape() == Qt::BitmapCursor && cursor.bitmap());
-    QImage bbits = cursor.bitmap()->toImage();
-    QImage mbits = cursor.mask()->toImage();
+    Q_ASSERT(cursor.shape() == Qt::BitmapCursor && !cursor.bitmap(Qt::ReturnByValue).isNull());
+    QImage bbits = cursor.bitmap(Qt::ReturnByValue).toImage();
+    QImage mbits = cursor.mask(Qt::ReturnByValue).toImage();
     scaleFactor /= bbits.devicePixelRatioF();
     if (!qFuzzyCompare(scaleFactor, 1)) {
         const QSize scaledSize = (QSizeF(bbits.size()) * scaleFactor).toSize();
@@ -686,6 +687,30 @@ void QWindowsCursor::setPos(const QPoint &pos)
     SetCursorPos(pos.x() , pos.y());
 }
 
+/*
+    The standard size is 32x32, even though the cursor is actually just
+    16 pixels large. If a large cursor is set in the accessibility settings,
+    then the cursor increases with 8 pixels for each step.
+*/
+QSize QWindowsCursor::size() const
+{
+    const QPair<DWORD,bool> cursorSizeSetting =
+        QWinRegistryKey(HKEY_CURRENT_USER, LR"(Control Panel\Cursors)")
+                       .dwordValue(L"CursorBaseSize");
+    const int baseSize = screenCursorSize(m_screen).width() / 2;
+    if (!cursorSizeSetting.second)
+        return QSize(baseSize / 2, baseSize / 2);
+
+    // The registry values are dpi-independent, so we need to scale the result.
+    int cursorSizeValue = cursorSizeSetting.first * m_screen->logicalDpi().first
+                                                  / m_screen->logicalBaseDpi().first;
+
+    // map from registry value 32-256 to 0-14, and from there to pixels
+    cursorSizeValue = (cursorSizeValue - 2 * baseSize) / baseSize;
+    const int cursorSize = baseSize + cursorSizeValue * (baseSize / 2);
+    return QSize(cursorSize, cursorSize);
+}
+
 QPixmap QWindowsCursor::dragDefaultCursor(Qt::DropAction action) const
 {
     switch (action) {