1 files changed, 9 insertions, 16 deletions

diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp
index c735c83f6a..74c78088ad 100644
--- a/examples/widgets/painting/shared/hoverpoints.cpp
+++ b/examples/widgets/painting/shared/hoverpoints.cpp
@@ -48,10 +48,6 @@
 **
 ****************************************************************************/
 
-#ifdef QT_OPENGL_SUPPORT
-#include <QGLWidget>
-#endif
-
 #include "arthurwidgets.h"
 #include "hoverpoints.h"
 
@@ -77,8 +73,8 @@ HoverPoints::HoverPoints(QWidget *widget, PointShape shape)
     m_editable = true;
     m_enabled = true;
 
-    connect(this, SIGNAL(pointsChanged(QPolygonF)),
-            m_widget, SLOT(update()));
+    connect(this, &HoverPoints::pointsChanged,
+            m_widget, QOverload<>::of(&QWidget::update));
 }
 
 
@@ -178,7 +174,7 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event)
                 const QTouchEvent *const touchEvent = static_cast<const QTouchEvent*>(event);
                 const QList<QTouchEvent::TouchPoint> points = touchEvent->touchPoints();
                 const qreal pointSize = qMax(m_pointSize.width(), m_pointSize.height());
-                foreach (const QTouchEvent::TouchPoint &touchPoint, points) {
+                for (const QTouchEvent::TouchPoint &touchPoint : points) {
                     const int id = touchPoint.id();
                     switch (touchPoint.state()) {
                     case Qt::TouchPointPressed:
@@ -269,11 +265,6 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event)
             QApplication::sendEvent(object, event);
             m_widget = that_widget;
             paintPoints();
-#ifdef QT_OPENGL_SUPPORT
-            ArthurFrame *af = qobject_cast<ArthurFrame *>(that_widget);
-            if (af && af->usesOpenGL())
-                af->glWidget()->swapBuffers();
-#endif
             return true;
         }
         default:
@@ -288,12 +279,14 @@ bool HoverPoints::eventFilter(QObject *object, QEvent *event)
 void HoverPoints::paintPoints()
 {
     QPainter p;
-#ifdef QT_OPENGL_SUPPORT
+#if QT_CONFIG(opengl)
     ArthurFrame *af = qobject_cast<ArthurFrame *>(m_widget);
-    if (af && af->usesOpenGL())
-        p.begin(af->glWidget());
-    else
+    if (af && af->usesOpenGL() && af->glWindow()->isValid()) {
+        af->glWindow()->makeCurrent();
+        p.begin(af->glWindow());
+    } else {
         p.begin(m_widget);
+    }
 #else
     p.begin(m_widget);
 #endif