15 files changed, 43 insertions, 43 deletions
diff --git a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
index 78fc6b1a63..3f2578bc1f 100644
--- a/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
+++ b/examples/opengl/legacy/framebufferobject2/framebufferobject2.pro
@@ -8,4 +8,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/framebufferobject2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/framebufferobject2/glwidget.h b/examples/opengl/legacy/framebufferobject2/glwidget.h
index 8f46f65b29..d3e4aa5af5 100644
--- a/examples/opengl/legacy/framebufferobject2/glwidget.h
+++ b/examples/opengl/legacy/framebufferobject2/glwidget.h
@@ -55,12 +55,12 @@ class GLWidget : public QGLWidget
 public:
     GLWidget(QWidget *parent);
     ~GLWidget();
-    void initializeGL() Q_DECL_OVERRIDE;
-    void resizeGL(int w, int h) Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE { update(); }
-    void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE { killTimer(timerId); }
-    void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE { timerId = startTimer(20); }
+    void initializeGL() override;
+    void resizeGL(int w, int h) override;
+    void paintGL() override;
+    void timerEvent(QTimerEvent *) override { update(); }
+    void mousePressEvent(QMouseEvent *) override { killTimer(timerId); }
+    void mouseReleaseEvent(QMouseEvent *) override { timerId = startTimer(20); }
 
     void drawCube(int i, GLfloat z, GLfloat ri, GLfloat jmp, GLfloat amp);
 
diff --git a/examples/opengl/legacy/grabber/glwidget.h b/examples/opengl/legacy/grabber/glwidget.h
index 3a6e2fb3bb..67020b0ada 100644
--- a/examples/opengl/legacy/grabber/glwidget.h
+++ b/examples/opengl/legacy/grabber/glwidget.h
@@ -76,11 +76,11 @@ signals:
     void zRotationChanged(int angle);
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
-    void resizeGL(int width, int height) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintGL() override;
+    void resizeGL(int width, int height) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 
 private slots:
     void advanceGears();
diff --git a/examples/opengl/legacy/grabber/grabber.pro b/examples/opengl/legacy/grabber/grabber.pro
index 1db0e23156..88c03f1c5e 100644
--- a/examples/opengl/legacy/grabber/grabber.pro
+++ b/examples/opengl/legacy/grabber/grabber.pro
@@ -9,4 +9,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/grabber
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/hellogl/glwidget.h b/examples/opengl/legacy/hellogl/glwidget.h
index 89446d5937..8154d7405c 100644
--- a/examples/opengl/legacy/hellogl/glwidget.h
+++ b/examples/opengl/legacy/hellogl/glwidget.h
@@ -65,8 +65,8 @@ public:
     GLWidget(QWidget *parent = 0);
     ~GLWidget();
 
-    QSize minimumSizeHint() const Q_DECL_OVERRIDE;
-    QSize sizeHint() const Q_DECL_OVERRIDE;
+    QSize minimumSizeHint() const override;
+    QSize sizeHint() const override;
 //! [0]
 
 //! [1]
@@ -83,11 +83,11 @@ signals:
 
 //! [2]
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
-    void resizeGL(int width, int height) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintGL() override;
+    void resizeGL(int width, int height) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
 //! [2]
 
 //! [3]
diff --git a/examples/opengl/legacy/hellogl/hellogl.pro b/examples/opengl/legacy/hellogl/hellogl.pro
index c211242fd2..c6e926c245 100644
--- a/examples/opengl/legacy/hellogl/hellogl.pro
+++ b/examples/opengl/legacy/hellogl/hellogl.pro
@@ -14,4 +14,4 @@ QT           += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/hellogl
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/hellogl/window.h b/examples/opengl/legacy/hellogl/window.h
index 8d684a155b..04e83694a4 100644
--- a/examples/opengl/legacy/hellogl/window.h
+++ b/examples/opengl/legacy/hellogl/window.h
@@ -67,7 +67,7 @@ public:
     Window();
 
 protected:
-    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) override;
 
 private:
     QSlider *createSlider();
diff --git a/examples/opengl/legacy/legacy.pro b/examples/opengl/legacy/legacy.pro
index 0a74d50f7f..1398332c11 100644
--- a/examples/opengl/legacy/legacy.pro
+++ b/examples/opengl/legacy/legacy.pro
@@ -2,7 +2,7 @@ requires(qtHaveModule(opengl))
 
 TEMPLATE      = subdirs
 
-!contains(QT_CONFIG, dynamicgl): !contains(QT_CONFIG, opengles2) {
+!qtConfig(dynamicgl):!qtConfig(opengles2) {
     # legacy desktop-only examples, no dynamic GL support
     SUBDIRS   = \
                 grabber \
diff --git a/examples/opengl/legacy/overpainting/glwidget.h b/examples/opengl/legacy/overpainting/glwidget.h
index ffa7922061..e5ea539f6d 100644
--- a/examples/opengl/legacy/overpainting/glwidget.h
+++ b/examples/opengl/legacy/overpainting/glwidget.h
@@ -68,7 +68,7 @@ public:
     ~GLWidget();
 //! [0]
 
-    QSize sizeHint() const Q_DECL_OVERRIDE;
+    QSize sizeHint() const override;
     int xRotation() const { return xRot; }
     int yRotation() const { return yRot; }
     int zRotation() const { return zRot; }
@@ -80,12 +80,12 @@ public slots:
 
 //! [1]
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
-    void resizeGL(int width, int height) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void paintEvent(QPaintEvent *event) override;
+    void resizeGL(int width, int height) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 
 private slots:
     void animate();
diff --git a/examples/opengl/legacy/overpainting/overpainting.pro b/examples/opengl/legacy/overpainting/overpainting.pro
index cc46f18889..17213a6079 100644
--- a/examples/opengl/legacy/overpainting/overpainting.pro
+++ b/examples/opengl/legacy/overpainting/overpainting.pro
@@ -16,4 +16,4 @@ SOURCES = bubble.cpp \
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/overpainting
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers/glwidget.h b/examples/opengl/legacy/pbuffers/glwidget.h
index d447abb638..397329c428 100644
--- a/examples/opengl/legacy/pbuffers/glwidget.h
+++ b/examples/opengl/legacy/pbuffers/glwidget.h
@@ -67,11 +67,11 @@ public:
     ~GLWidget();
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
-    void resizeGL(int width, int height) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE { setAnimationPaused(true); }
-    void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE { setAnimationPaused(false); }
+    void initializeGL() override;
+    void paintGL() override;
+    void resizeGL(int width, int height) override;
+    void mousePressEvent(QMouseEvent *) override { setAnimationPaused(true); }
+    void mouseReleaseEvent(QMouseEvent *) override { setAnimationPaused(false); }
 
 private:
     void initializeGeometry();
diff --git a/examples/opengl/legacy/pbuffers/pbuffers.pro b/examples/opengl/legacy/pbuffers/pbuffers.pro
index d779a2a2dc..7572ba3583 100644
--- a/examples/opengl/legacy/pbuffers/pbuffers.pro
+++ b/examples/opengl/legacy/pbuffers/pbuffers.pro
@@ -10,4 +10,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/pbuffers2/pbuffers2.pro b/examples/opengl/legacy/pbuffers2/pbuffers2.pro
index 2ba40a6f74..f1baae3931 100644
--- a/examples/opengl/legacy/pbuffers2/pbuffers2.pro
+++ b/examples/opengl/legacy/pbuffers2/pbuffers2.pro
@@ -8,4 +8,4 @@ RESOURCES += pbuffers2.qrc
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/pbuffers2
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")
diff --git a/examples/opengl/legacy/samplebuffers/glwidget.h b/examples/opengl/legacy/samplebuffers/glwidget.h
index f46f8e19ac..f02f0835ef 100644
--- a/examples/opengl/legacy/samplebuffers/glwidget.h
+++ b/examples/opengl/legacy/samplebuffers/glwidget.h
@@ -56,10 +56,10 @@ public:
     GLWidget(QWidget *parent);
 
 protected:
-    void initializeGL() Q_DECL_OVERRIDE;
-    void resizeGL(int w, int h) Q_DECL_OVERRIDE;
-    void paintGL() Q_DECL_OVERRIDE;
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void initializeGL() override;
+    void resizeGL(int w, int h) override;
+    void paintGL() override;
+    void timerEvent(QTimerEvent *) override;
 
     void makeObject();
     void quad(GLenum primitive, GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
diff --git a/examples/opengl/legacy/samplebuffers/samplebuffers.pro b/examples/opengl/legacy/samplebuffers/samplebuffers.pro
index 3719f5039d..aca56f8df8 100644
--- a/examples/opengl/legacy/samplebuffers/samplebuffers.pro
+++ b/examples/opengl/legacy/samplebuffers/samplebuffers.pro
@@ -7,4 +7,4 @@ QT += opengl widgets
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/legacy/samplebuffers
 INSTALLS += target
 
-contains(QT_CONFIG, opengles.|angle|dynamicgl):error("This example requires Qt to be configured with -opengl desktop")
+qtConfig(opengles.|angle|dynamicgl): error("This example requires Qt to be configured with -opengl desktop")