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

diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index 1c27a941cc..eed615de36 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -78,14 +78,14 @@ public:
 
     virtual bool initialize();
 
-    QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; }
-    int depth() const Q_DECL_OVERRIDE { return mDepth; }
-    QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; }
-    QSizeF physicalSize() const Q_DECL_OVERRIDE { return mPhysicalSize; }
-    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; }
+    QRect geometry() const override { return mGeometry; }
+    int depth() const override { return mDepth; }
+    QImage::Format format() const override { return mFormat; }
+    QSizeF physicalSize() const override { return mPhysicalSize; }
+    QPlatformCursor *cursor() const override { return mCursor; }
 
     QWindow *topWindow() const;
-    QWindow *topLevelAt(const QPoint & p) const Q_DECL_OVERRIDE;
+    QWindow *topLevelAt(const QPoint & p) const override;
 
     // compositor api
     virtual void addWindow(QFbWindow *window);
@@ -109,7 +109,7 @@ protected:
     virtual QRegion doRedraw();
 
     void initializeCompositor();
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
 
     QFbWindow *windowForId(WId wid) const;