5 files changed, 29 insertions, 22 deletions
diff --git a/src/plugins/platforms/vnc/main.cpp b/src/plugins/platforms/vnc/main.cpp
index 6ee8bf1ec6..3ec0f0b78d 100644
--- a/src/plugins/platforms/vnc/main.cpp
+++ b/src/plugins/platforms/vnc/main.cpp
@@ -48,7 +48,7 @@ class QVncIntegrationPlugin : public QPlatformIntegrationPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "vnc.json")
 public:
-    QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
+    QPlatformIntegration *create(const QString&, const QStringList&) override;
 };
 
 QPlatformIntegration* QVncIntegrationPlugin::create(const QString& system, const QStringList& paramList)
diff --git a/src/plugins/platforms/vnc/qvnc_p.h b/src/plugins/platforms/vnc/qvnc_p.h
index 1c44cd1569..e58b6ae056 100644
--- a/src/plugins/platforms/vnc/qvnc_p.h
+++ b/src/plugins/platforms/vnc/qvnc_p.h
@@ -95,7 +95,7 @@ public:
     QVncDirtyMapOptimized(QVncScreen *screen) : QVncDirtyMap(screen) {}
     ~QVncDirtyMapOptimized() {}
 
-    void setDirty(int x, int y, bool force = false);
+    void setDirty(int x, int y, bool force = false) override;
 };
 
 
@@ -216,7 +216,7 @@ class QRfbRawEncoder : public QRfbEncoder
 public:
     QRfbRawEncoder(QVncClient *s) : QRfbEncoder(s) {}
 
-    void write();
+    void write() override;
 
 private:
     QByteArray buffer;
@@ -372,7 +372,7 @@ public:
 
     void write(QVncClient *client) const;
 
-    void changeCursor(QCursor *widgetCursor, QWindow *window);
+    void changeCursor(QCursor *widgetCursor, QWindow *window) override;
 
     void addClient(QVncClient *client);
     uint removeClient(QVncClient *client);
diff --git a/src/plugins/platforms/vnc/qvncintegration.h b/src/plugins/platforms/vnc/qvncintegration.h
index 293ff54376..34a6a6b941 100644
--- a/src/plugins/platforms/vnc/qvncintegration.h
+++ b/src/plugins/platforms/vnc/qvncintegration.h
@@ -55,19 +55,19 @@ public:
     QVncIntegration(const QStringList &paramList);
     ~QVncIntegration();
 
-    void initialize() Q_DECL_OVERRIDE;
-    bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE;
+    void initialize() override;
+    bool hasCapability(QPlatformIntegration::Capability cap) const override;
 
-    QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE;
-    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE;
+    QPlatformWindow *createPlatformWindow(QWindow *window) const override;
+    QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override;
 
-    QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE;
+    QAbstractEventDispatcher *createEventDispatcher() const override;
 
-    QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
-    QPlatformServices *services() const Q_DECL_OVERRIDE;
-    QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; }
+    QPlatformFontDatabase *fontDatabase() const override;
+    QPlatformServices *services() const override;
+    QPlatformInputContext *inputContext() const override { return m_inputContext; }
 
-    QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
+    QPlatformNativeInterface *nativeInterface() const override;
 
     QList<QPlatformScreen *> screens() const;
 
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index 64f1bc0bf7..75c8bedff7 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -151,10 +151,10 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
 {
     if (!wid) {
         if (width < 0)
-            width = mScreenImage->width() - x;
+            width = mScreenImage.width() - x;
         if (height < 0)
-            height = mScreenImage->height() - y;
-        return QPixmap::fromImage(*mScreenImage).copy(x, y, width, height);
+            height = mScreenImage.height() - y;
+        return QPixmap::fromImage(mScreenImage).copy(x, y, width, height);
     }
 
     QFbWindow *window = windowForId(wid);
@@ -166,7 +166,7 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
             height = geom.height() - y;
         QRect rect(geom.topLeft() + QPoint(x, y), QSize(width, height));
         rect &= window->geometry();
-        return QPixmap::fromImage(*mScreenImage).copy(rect);
+        return QPixmap::fromImage(mScreenImage).copy(rect);
     }
 
     return QPixmap();
@@ -188,5 +188,10 @@ bool QVncScreen::swapBytes() const
 }
 #endif
 
+QFbScreen::Flags QVncScreen::flags() const
+{
+    return QFbScreen::DontForceFirstWindowToFullScreen;
+}
+
 QT_END_NAMESPACE
 
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
index 0b42c3c7ea..b2dd89a2ed 100644
--- a/src/plugins/platforms/vnc/qvncscreen.h
+++ b/src/plugins/platforms/vnc/qvncscreen.h
@@ -59,16 +59,18 @@ public:
     QVncScreen(const QStringList &args);
     ~QVncScreen();
 
-    bool initialize();
+    bool initialize() override;
 
-    QPixmap grabWindow(WId wid, int x, int y, int width, int height) const Q_DECL_OVERRIDE;
+    QPixmap grabWindow(WId wid, int x, int y, int width, int height) const override;
 
-    QRegion doRedraw() Q_DECL_OVERRIDE;
-    QImage *image() const { return mScreenImage; }
+    QRegion doRedraw() override;
+    QImage *image() { return &mScreenImage; }
 
     void enableClientCursor(QVncClient *client);
     void disableClientCursor(QVncClient *client);
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE;
+    QPlatformCursor *cursor() const override;
+
+    Flags flags() const override;
 
     void clearDirty() { dirtyRegion = QRegion(); }