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

diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
index bea2897240..54152aebf7 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
@@ -302,7 +302,7 @@ public:
         g_iteratorCurrentUrl.setLocalData(QString());
     }
 
-    QString next() Q_DECL_OVERRIDE
+    QString next() override
     {
         // Cache the URL that we are about to return, since QDir will immediately create a
         // new file engine on the file and ask if it exists. Unless we do this, we end up
@@ -314,17 +314,17 @@ public:
         return url;
     }
 
-    bool hasNext() const Q_DECL_OVERRIDE
+    bool hasNext() const override
     {
         return m_enumerator->hasNext();
     }
 
-    QString currentFileName() const Q_DECL_OVERRIDE
+    QString currentFileName() const override
     {
         return g_iteratorCurrentUrl.localData();
     }
 
-    QFileInfo currentFileInfo() const Q_DECL_OVERRIDE
+    QFileInfo currentFileInfo() const override
     {
         return QFileInfo(currentFileName());
     }