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

diff --git a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
index 58dee6f6ca..7200d1cc8a 100644
--- a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
+++ b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp
@@ -74,17 +74,17 @@ public:
         initCount = resizeCount = paintCount = 0;
     }
 
-    void initializeGL() Q_DECL_OVERRIDE {
+    void initializeGL() override {
         ++initCount;
     }
 
-    void resizeGL(int w, int h) Q_DECL_OVERRIDE {
+    void resizeGL(int w, int h) override {
         ++resizeCount;
         QCOMPARE(w, size().width());
         QCOMPARE(h, size().height());
     }
 
-    void paintGL() Q_DECL_OVERRIDE {
+    void paintGL() override {
         ++paintCount;
 
         QOpenGLContext *ctx = QOpenGLContext::currentContext();
@@ -144,7 +144,7 @@ void tst_QOpenGLWindow::basic()
 class PainterWindow : public QOpenGLWindow
 {
 public:
-    void paintGL() Q_DECL_OVERRIDE {
+    void paintGL() override {
         QOpenGLContext *ctx = QOpenGLContext::currentContext();
         QVERIFY(ctx);
         QCOMPARE(ctx, context());
@@ -183,7 +183,7 @@ public:
     PartialPainterWindow(QOpenGLWindow::UpdateBehavior u)
         : QOpenGLWindow(u), x(0) { }
 
-    void paintGL() Q_DECL_OVERRIDE {
+    void paintGL() override {
         ++paintCount;
 
         QPainter p(this);
@@ -244,7 +244,7 @@ public:
         Error
     } m_state;
 
-    void paintUnderGL() Q_DECL_OVERRIDE {
+    void paintUnderGL() override {
         if (m_state == None || m_state == PaintOver)
             m_state = PaintUnder;
         else
@@ -255,7 +255,7 @@ public:
         QCOMPARE(fbo, GLuint(0));
     }
 
-    void paintGL() Q_DECL_OVERRIDE {
+    void paintGL() override {
         if (m_state == PaintUnder)
             m_state = Paint;
         else
@@ -268,7 +268,7 @@ public:
         QCOMPARE(fbo, defaultFramebufferObject());
     }
 
-    void paintOverGL() Q_DECL_OVERRIDE {
+    void paintOverGL() override {
         if (m_state == Paint)
             m_state = PaintOver;
         else