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

diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
index 85422071aa..f0eb69718a 100644
--- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp
@@ -55,8 +55,8 @@ class QOffscreenCursor : public QPlatformCursor
 public:
     QOffscreenCursor() : m_pos(10, 10) {}
 
-    QPoint pos() const Q_DECL_OVERRIDE { return m_pos; }
-    void setPos(const QPoint &pos) Q_DECL_OVERRIDE
+    QPoint pos() const override { return m_pos; }
+    void setPos(const QPoint &pos) override
     {
         m_pos = pos;
         const QWindowList wl = QGuiApplication::topLevelWindows();
@@ -82,7 +82,7 @@ public:
         QOffscreenScreen::windowContainingCursor = containing ? containing->handle() : 0;
     }
 #ifndef QT_NO_CURSOR
-    void changeCursor(QCursor *windowCursor, QWindow *window) Q_DECL_OVERRIDE
+    void changeCursor(QCursor *windowCursor, QWindow *window) override
     {
         Q_UNUSED(windowCursor);
         Q_UNUSED(window);