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

diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index a0188f8ba9..a485788ec2 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -551,18 +551,18 @@ public:
         : QIODevice(), buf(byteArray), offset(0), ownbuf(false) { }
     virtual ~SequentialReadBuffer() { if (ownbuf) delete buf; }
 
-    bool isSequential() const Q_DECL_OVERRIDE { return true; }
+    bool isSequential() const override { return true; }
     const QByteArray &buffer() const { return *buf; }
 
 protected:
-    qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE
+    qint64 readData(char *data, qint64 maxSize) override
     {
         maxSize = qMin(maxSize, qint64(buf->size() - offset));
         memcpy(data, buf->constData() + offset, maxSize);
         offset += maxSize;
         return maxSize;
     }
-    qint64 writeData(const char * /* data */, qint64 /* maxSize */) Q_DECL_OVERRIDE
+    qint64 writeData(const char * /* data */, qint64 /* maxSize */) override
     {
         return -1;
     }
@@ -598,13 +598,13 @@ public:
     RandomAccessBuffer(const char *data) : QIODevice(), buf(data) { }
 
 protected:
-    qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE
+    qint64 readData(char *data, qint64 maxSize) override
     {
         maxSize = qMin(maxSize, qint64(buf.size() - pos()));
         memcpy(data, buf.constData() + pos(), maxSize);
         return maxSize;
     }
-    qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE
+    qint64 writeData(const char *data, qint64 maxSize) override
     {
         maxSize = qMin(maxSize, qint64(buf.size() - pos()));
         memcpy(buf.data() + pos(), data, maxSize);