1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index 7db1ee1c1b..dc9ed46956 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -10,6 +10,7 @@
 #include <QtGui/QWindow>
 #include <QtGui/QBitmap>
 #include <QtGui/private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
 
 #if QT_CONFIG(xcb_xlib)
 #include <X11/cursorfont.h>
@@ -258,14 +259,14 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
     m_bitmapCache.setMaxCost(8);
 #endif
 
+    updateContext();
+
     if (cursorCount++)
         return;
 
     cursorFont = xcb_generate_id(xcb_connection());
     const char *cursorStr = "cursor";
     xcb_open_font(xcb_connection(), cursorFont, strlen(cursorStr), cursorStr);
-
-    updateContext();
 }
 
 QXcbCursor::~QXcbCursor()
@@ -280,7 +281,7 @@ QXcbCursor::~QXcbCursor()
         xcb_close_font(conn, cursorFont);
 
 #ifndef QT_NO_CURSOR
-    for (xcb_cursor_t cursor : qAsConst(m_cursorHash))
+    for (xcb_cursor_t cursor : std::as_const(m_cursorHash))
         xcb_free_cursor(conn, cursor);
 #endif
 
@@ -288,6 +289,13 @@ QXcbCursor::~QXcbCursor()
         xcb_cursor_context_free(m_cursorContext);
 }
 
+QSize QXcbCursor::size() const
+{
+    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme())
+        return theme->themeHint(QPlatformTheme::MouseCursorSize).toSize();
+    return QSize(24, 24);
+}
+
 void QXcbCursor::updateContext()
 {
     if (m_cursorContext)