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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 14 insertions, 6 deletions

diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cpp
index 49eff2ad239..5a438a54a20 100644
--- a/src/gui/kernel/qplatformcursor.cpp
+++ b/src/gui/kernel/qplatformcursor.cpp
@@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE
                           QPlatformCursor::clearOverrideCursor().
 */
 
-QPlatformCursor::Capabilities QPlatformCursor::m_capabilities = 0;
+QPlatformCursor::Capabilities QPlatformCursor::m_capabilities = { };
 
 /*!
     \fn QPlatformCursor::QPlatformCursor()
@@ -128,7 +128,15 @@ void QPlatformCursor::setPos(const QPoint &pos)
         qWarning("This plugin does not support QCursor::setPos()"
                  "; emulating movement within the application.");
     }
-    QWindowSystemInterface::handleMouseEvent(0, pos, pos, Qt::NoButton, Qt::NoButton, QEvent::MouseMove);
+    QWindowSystemInterface::handleMouseEvent(nullptr, pos, pos, Qt::NoButton, Qt::NoButton, QEvent::MouseMove);
+}
+
+/*!
+    Returns the size of the cursor, in native pixels.
+*/
+QSize QPlatformCursor::size() const
+{
+    return QSize(16, 16);
 }
 
 // End of display and pointer event handling code
@@ -431,7 +439,7 @@ void QPlatformCursorImage::createSystemCursor(int id)
 {
     if (!systemCursorTableInit) {
         for (int i = 0; i <= Qt::LastCursor; i++)
-            systemCursorTable[i] = 0;
+            systemCursorTable[i] = nullptr;
         systemCursorTableInit = true;
     }
     switch (id) {
@@ -478,7 +486,7 @@ void QPlatformCursorImage::createSystemCursor(int id)
 
         case Qt::BlankCursor:
             systemCursorTable[Qt::BlankCursor] =
-                new QPlatformCursorImage(0, 0, 0, 0, 0, 0);
+                new QPlatformCursorImage(nullptr, nullptr, 0, 0, 0, 0);
             break;
 
         // 20x20 cursors
@@ -548,14 +556,14 @@ void QPlatformCursorImage::createSystemCursor(int id)
 
 void QPlatformCursorImage::set(Qt::CursorShape id)
 {
-    QPlatformCursorImage *cursor = 0;
+    QPlatformCursorImage *cursor = nullptr;
     if (unsigned(id) <= unsigned(Qt::LastCursor)) {
         if (!systemCursorTable[id])
             createSystemCursor(id);
         cursor = systemCursorTable[id];
     }
 
-    if (cursor == 0) {
+    if (cursor == nullptr) {
         if (!systemCursorTable[Qt::ArrowCursor])
             createSystemCursor(Qt::ArrowCursor);
         cursor = systemCursorTable[Qt::ArrowCursor];