6 files changed, 22 insertions, 4 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp
index 5a906dda7b..4b52014db1 100644
--- a/src/corelib/json/qjsonvalue.cpp
+++ b/src/corelib/json/qjsonvalue.cpp
@@ -349,6 +349,12 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
     \row
         \li
             \list
+                \li QMetaType::Nullptr
+            \endlist
+        \li QJsonValue::Null
+    \row
+        \li
+            \list
                 \li QMetaType::Bool
             \endlist
         \li QJsonValue::Bool
@@ -393,6 +399,8 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other)
 QJsonValue QJsonValue::fromVariant(const QVariant &variant)
 {
     switch (variant.userType()) {
+    case QMetaType::Nullptr:
+        return QJsonValue(Null);
     case QVariant::Bool:
         return QJsonValue(variant.toBool());
     case QVariant::Int:
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 72ae3b063f..ccfa7d0d38 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -3085,6 +3085,7 @@ bool QVariant::canConvert(int targetTypeId) const
 
     if (currentType == QMetaType::QJsonValue) {
         switch (targetTypeId) {
+        case QMetaType::Nullptr:
         case QMetaType::QString:
         case QMetaType::Bool:
         case QMetaType::Int:
diff --git a/src/plugins/platforms/vnc/qvnc.cpp b/src/plugins/platforms/vnc/qvnc.cpp
index f386be193d..a45bb1c19c 100644
--- a/src/plugins/platforms/vnc/qvnc.cpp
+++ b/src/plugins/platforms/vnc/qvnc.cpp
@@ -533,9 +533,11 @@ void QRfbRawEncoder::write()
 
 QVncClientCursor::QVncClientCursor()
 {
+#ifndef QT_NO_CURSOR
     QWindow *w = QGuiApplication::focusWindow();
     QCursor c = w ? w->cursor() : QCursor(Qt::ArrowCursor);
     changeCursor(&c, 0);
+#endif
 }
 
 QVncClientCursor::~QVncClientCursor()
@@ -582,10 +584,10 @@ void QVncClientCursor::write(QVncClient *client) const
         socket->write((const char*)bitmap.scanLine(i), width);
 }
 
-#ifndef QT_NO_CURSOR
 void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
 {
     Q_UNUSED(window);
+#ifndef QT_NO_CURSOR
     const Qt::CursorShape shape = widgetCursor ? widgetCursor->shape() : Qt::ArrowCursor;
 
     if (shape == Qt::BitmapCursor) {
@@ -599,6 +601,9 @@ void QVncClientCursor::changeCursor(QCursor *widgetCursor, QWindow *window)
         cursor = *platformImage.image();
         hotspot = platformImage.hotspot();
     }
+#else // !QT_NO_CURSOR
+    Q_UNUSED(widgetCursor);
+#endif
     for (auto client : clients)
         client->setDirtyCursor();
 }
@@ -614,7 +619,6 @@ uint QVncClientCursor::removeClient(QVncClient *client)
     clients.removeOne(client);
     return clients.count();
 }
-#endif
 
 QVncServer::QVncServer(QVncScreen *screen, quint16 port)
     : qvnc_screen(screen)
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index 4de4be43d1..80fe5a2199 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -74,6 +74,8 @@ static PtrXcursorLibraryGetDefaultSize ptrXcursorLibraryGetDefaultSize = 0;
 static xcb_font_t cursorFont = 0;
 static int cursorCount = 0;
 
+#ifndef QT_NO_CURSOR
+
 static uint8_t cur_blank_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -276,8 +278,6 @@ static const char * const cursorNames[] = {
     "link"
 };
 
-#ifndef QT_NO_CURSOR
-
 QXcbCursorCacheKey::QXcbCursorCacheKey(const QCursor &c)
     : shape(c.shape()), bitmapCacheKey(0), maskCacheKey(0)
 {
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp
index 4beb64a254..46d2a4c1aa 100644
--- a/src/widgets/graphicsview/qgraphicswidget_p.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp
@@ -722,6 +722,9 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent
 #ifndef QT_NO_CURSOR
     if (needsSetCursorCall)
         q->setCursor(cursorShape);
+#else
+    Q_UNUSED(needsSetCursorCall);
+    Q_UNUSED(cursorShape);
 #endif
     // update buttons if we hover over them
     windowData->hoveredSubControl = q->style()->hitTestComplexControl(QStyle::CC_TitleBar, &bar, pos.toPoint(), 0);
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 89eff898fe..358838b4e9 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -2790,6 +2790,8 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget)
     // Send enter/leave events followed by a mouse move on the entered widget.
     QMouseEvent e(QEvent::MouseMove, pos, windowPos, globalPos, Qt::NoButton, Qt::NoButton, Qt::NoModifier);
     sendMouseEvent(widgetUnderCursor, &e, widgetUnderCursor, tlw, &qt_button_down, qt_last_mouse_receiver);
+#else // !QT_NO_CURSOR
+    Q_UNUSED(widget);
 #endif // QT_NO_CURSOR
 }