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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index 32114c6443..8390fa19cd 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -537,7 +537,7 @@ QVncClientCursor::QVncClientCursor()
 {
     QWindow *w = QGuiApplication::focusWindow();
     QCursor c = w ? w->cursor() : QCursor(Qt::ArrowCursor);
-    changeCursor(&c, 0);
+    changeCursor(&c, nullptr);
 }
 
 QVncClientCursor::~QVncClientCursor()
@@ -595,7 +595,7 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
         cursor = widgetCursor->pixmap().toImage();
     } else {
         // system cursor
-        QPlatformCursorImage platformImage(0, 0, 0, 0, 0, 0);
+        QPlatformCursorImage platformImage(nullptr, nullptr, 0, 0, 0, 0);
         platformImage.set(shape);
         cursor = *platformImage.image();
         hotspot = platformImage.hotspot();