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

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

1 files changed, 4 insertions, 0 deletions

diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index cd43ce4e69..67d33de2f0 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -131,6 +131,8 @@ void QVncScreen::enableClientCursor(QVncClient *client)
     if (!clientCursor)
         clientCursor = new QVncClientCursor();
     clientCursor->addClient(client);
+#else
+    Q_UNUSED(client)
 #endif
 }
 
@@ -144,6 +146,8 @@ void QVncScreen::disableClientCursor(QVncClient *client)
     }
 
     mCursor = new QFbCursor(this);
+#else
+    Q_UNUSED(client)
 #endif
 }