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>

3 files changed, 8 insertions, 8 deletions

diff --git a/examples/network/multistreamclient/chatconsumer.h b/examples/network/multistreamclient/chatconsumer.h
index 9e12f99359..e10c0d7850 100644
--- a/examples/network/multistreamclient/chatconsumer.h
+++ b/examples/network/multistreamclient/chatconsumer.h
@@ -64,8 +64,8 @@ class ChatConsumer : public Consumer
 public:
     explicit ChatConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
 
 private slots:
     void returnPressed();
diff --git a/examples/network/multistreamclient/movieconsumer.h b/examples/network/multistreamclient/movieconsumer.h
index 74321a8505..3f78bf2060 100644
--- a/examples/network/multistreamclient/movieconsumer.h
+++ b/examples/network/multistreamclient/movieconsumer.h
@@ -63,9 +63,9 @@ class MovieConsumer : public Consumer
 public:
     explicit MovieConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
-    void serverDisconnected() Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
+    void serverDisconnected() override;
 
 private:
     QLabel *label;
diff --git a/examples/network/multistreamclient/timeconsumer.h b/examples/network/multistreamclient/timeconsumer.h
index 3faa4a6b1a..84a7796699 100644
--- a/examples/network/multistreamclient/timeconsumer.h
+++ b/examples/network/multistreamclient/timeconsumer.h
@@ -64,9 +64,9 @@ class TimeConsumer : public Consumer
 public:
     explicit TimeConsumer(QObject *parent = nullptr);
 
-    QWidget *widget() Q_DECL_OVERRIDE;
-    void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE;
-    void serverDisconnected() Q_DECL_OVERRIDE;
+    QWidget *widget() override;
+    void readDatagram(const QByteArray &ba) override;
+    void serverDisconnected() override;
 
 private slots:
     void timerTick();