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, 11 insertions, 11 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index 966d1a7e80..255cf8bca9 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/src/plugins/platforms/ios/qiosinputcontext.h
@@ -88,24 +88,24 @@ public:
     QIOSInputContext();
     ~QIOSInputContext();
 
-    bool isValid() const Q_DECL_OVERRIDE { return true; }
+    bool isValid() const override { return true; }
 
-    void showInputPanel() Q_DECL_OVERRIDE;
-    void hideInputPanel() Q_DECL_OVERRIDE;
+    void showInputPanel() override;
+    void hideInputPanel() override;
 
-    bool isInputPanelVisible() const Q_DECL_OVERRIDE;
-    bool isAnimating() const Q_DECL_OVERRIDE;
-    QRectF keyboardRect() const Q_DECL_OVERRIDE;
+    bool isInputPanelVisible() const override;
+    bool isAnimating() const override;
+    QRectF keyboardRect() const override;
 
-    void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void commit() Q_DECL_OVERRIDE;
+    void update(Qt::InputMethodQueries) override;
+    void reset() override;
+    void commit() override;
 
-    QLocale locale() const Q_DECL_OVERRIDE;
+    QLocale locale() const override;
 
     void clearCurrentFocusObject();
 
-    void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
+    void setFocusObject(QObject *object) override;
     void focusWindowChanged(QWindow *focusWindow);
 
     void scrollToCursor();