Replace Q_DECL_OVERRIDE with override where possible

Remaining uses of Q_DECL_OVERRIDE are in:

src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
  (definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index da8a6aabdc..1342d66201 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -60,35 +60,35 @@ public:
     explicit QIOSWindow(QWindow *window);
     ~QIOSWindow();
 
-    void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+    void setGeometry(const QRect &rect) override;
 
-    void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE;
-    void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE;
-    void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE;
-    void setVisible(bool visible) Q_DECL_OVERRIDE;
-    void setOpacity(qreal level) Q_DECL_OVERRIDE;
+    void setWindowState(Qt::WindowStates state) override;
+    void setParent(const QPlatformWindow *window) override;
+    void handleContentOrientationChange(Qt::ScreenOrientation orientation) override;
+    void setVisible(bool visible) override;
+    void setOpacity(qreal level) override;
 
-    bool isExposed() const Q_DECL_OVERRIDE;
-    void propagateSizeHints() Q_DECL_OVERRIDE {}
+    bool isExposed() const override;
+    void propagateSizeHints() override {}
 
-    void raise() Q_DECL_OVERRIDE{ raiseOrLower(true); }
-    void lower() Q_DECL_OVERRIDE { raiseOrLower(false); }
+    void raise() override{ raiseOrLower(true); }
+    void lower() override { raiseOrLower(false); }
 
     bool shouldAutoActivateWindow() const;
-    void requestActivateWindow() Q_DECL_OVERRIDE;
+    void requestActivateWindow() override;
 
-    qreal devicePixelRatio() const Q_DECL_OVERRIDE;
+    qreal devicePixelRatio() const override;
 
-    bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; }
-    bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; }
+    bool setMouseGrabEnabled(bool grab) override { return grab; }
+    bool setKeyboardGrabEnabled(bool grab) override { return grab; }
 
-    WId winId() const Q_DECL_OVERRIDE { return WId(m_view); }
+    WId winId() const override { return WId(m_view); }
 
     void clearAccessibleCache();
 
-    QSurfaceFormat format() const Q_DECL_OVERRIDE;
+    QSurfaceFormat format() const override;
 
-    void requestUpdate() Q_DECL_OVERRIDE;
+    void requestUpdate() override;
 
     CAEAGLLayer *eaglLayer() const;