Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

7 files changed, 305 insertions, 112 deletions

diff --git a/examples/widgets/painting/shared/arthurstyle.cpp b/examples/widgets/painting/shared/arthurstyle.cpp
index f4fc76bda6..3fc461bbd2 100644
--- a/examples/widgets/painting/shared/arthurstyle.cpp
+++ b/examples/widgets/painting/shared/arthurstyle.cpp
@@ -61,10 +61,10 @@
 
 QPixmap cached(const QString &img)
 {
-    if (QPixmap *p = QPixmapCache::find(img))
-        return *p;
-
     QPixmap pm;
+    if (QPixmapCache::find(img, &pm))
+        return pm;
+
     pm = QPixmap::fromImage(QImage(img), Qt::OrderedDither | Qt::OrderedAlphaDither);
     if (pm.isNull())
         return QPixmap();
@@ -443,9 +443,9 @@ void ArthurStyle::polish(QWidget *widget)
     if (widget->layout() && qobject_cast<QGroupBox *>(widget)) {
         if (widget->findChildren<QGroupBox *>().size() == 0) {
             widget->layout()->setSpacing(0);
-            widget->layout()->setMargin(12);
+            widget->layout()->setContentsMargins(12, 12, 12, 12);
         } else {
-            widget->layout()->setMargin(13);
+            widget->layout()->setContentsMargins(13, 13, 13, 13);
         }
     }
 
diff --git a/examples/widgets/painting/shared/arthurwidgets.cpp b/examples/widgets/painting/shared/arthurwidgets.cpp
index 965660a3a3..bdac5de13c 100644
--- a/examples/widgets/painting/shared/arthurwidgets.cpp
+++ b/examples/widgets/painting/shared/arthurwidgets.cpp
@@ -60,6 +60,10 @@
 #include <QTextBrowser>
 #include <QBoxLayout>
 #include <QRegularExpression>
+#include <QOffscreenSurface>
+#include <QOpenGLContext>
+#include <QOpenGLPaintDevice>
+#include <QOpenGLWindow>
 
 extern QPixmap cached(const QString &img);
 
@@ -67,17 +71,12 @@ ArthurFrame::ArthurFrame(QWidget *parent)
     : QWidget(parent)
     , m_prefer_image(false)
 {
-#ifdef QT_OPENGL_SUPPORT
-    glw = 0;
+#if QT_CONFIG(opengl)
+    m_glWindow = nullptr;
+    m_glWidget = nullptr;
     m_use_opengl = false;
-    QGLFormat f = QGLFormat::defaultFormat();
-    f.setSampleBuffers(true);
-    f.setStencil(true);
-    f.setAlpha(true);
-    f.setAlphaBufferSize(8);
-    QGLFormat::setDefaultFormat(f);
 #endif
-    m_document = 0;
+    m_document = nullptr;
     m_show_doc = false;
 
     m_tile = QPixmap(128, 128);
@@ -94,37 +93,55 @@ ArthurFrame::ArthurFrame(QWidget *parent)
 }
 
 
-#ifdef QT_OPENGL_SUPPORT
+#if QT_CONFIG(opengl)
 void ArthurFrame::enableOpenGL(bool use_opengl)
 {
     if (m_use_opengl == use_opengl)
         return;
 
-    if (!glw && use_opengl) {
-        glw = new GLWidget(this);
-        glw->setAutoFillBackground(false);
-        glw->disableAutoBufferSwap();
+    m_use_opengl = use_opengl;
+
+    if (!m_glWindow && use_opengl) {
+        createGlWindow();
         QApplication::postEvent(this, new QResizeEvent(size(), size()));
     }
 
-    m_use_opengl = use_opengl;
     if (use_opengl) {
-        glw->show();
+        m_glWidget->show();
     } else {
-        if (glw)
-            glw->hide();
+        if (m_glWidget)
+            m_glWidget->hide();
     }
 
     update();
 }
+
+void ArthurFrame::createGlWindow()
+{
+    Q_ASSERT(m_use_opengl);
+
+    m_glWindow = new QOpenGLWindow();
+    QSurfaceFormat f = QSurfaceFormat::defaultFormat();
+    f.setSamples(4);
+    f.setAlphaBufferSize(8);
+    f.setStencilBufferSize(8);
+    m_glWindow->setFormat(f);
+    m_glWindow->setFlags(Qt::WindowTransparentForInput);
+    m_glWindow->resize(width() - 1, height() - 1);
+    m_glWindow->create();
+    m_glWidget = QWidget::createWindowContainer(m_glWindow, this);
+}
 #endif
 
+
 void ArthurFrame::paintEvent(QPaintEvent *e)
 {
     static QImage *static_image = 0;
+
     QPainter painter;
+
     if (preferImage()
-#ifdef QT_OPENGL_SUPPORT
+#if QT_CONFIG(opengl)
         && !m_use_opengl
 #endif
         ) {
@@ -142,10 +159,12 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
         painter.fillRect(0, height() - o, o, o, bg);
         painter.fillRect(width() - o, height() - o, o, o, bg);
     } else {
-#ifdef QT_OPENGL_SUPPORT
-        if (m_use_opengl) {
-            painter.begin(glw);
-            painter.fillRect(QRectF(0, 0, glw->width(), glw->height()), palette().color(backgroundRole()));
+#if QT_CONFIG(opengl)
+        if (m_use_opengl && m_glWindow->isValid()) {
+            m_glWindow->makeCurrent();
+
+            painter.begin(m_glWindow);
+            painter.fillRect(QRectF(0, 0, m_glWindow->width(), m_glWindow->height()), palette().color(backgroundRole()));
         } else {
             painter.begin(this);
         }
@@ -196,7 +215,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
     painter.drawPath(clipPath);
 
     if (preferImage()
-#ifdef QT_OPENGL_SUPPORT
+#if QT_CONFIG(opengl)
         && !m_use_opengl
 #endif
         ) {
@@ -204,18 +223,17 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
         painter.begin(this);
         painter.drawImage(e->rect(), *static_image, e->rect());
     }
-
-#ifdef QT_OPENGL_SUPPORT
-    if (m_use_opengl && (inherits("PathDeformRenderer") || inherits("PathStrokeRenderer") || inherits("CompositionRenderer") || m_show_doc))
-        glw->swapBuffers();
+#if QT_CONFIG(opengl)
+    if (m_use_opengl)
+        m_glWindow->update();
 #endif
 }
 
 void ArthurFrame::resizeEvent(QResizeEvent *e)
 {
-#ifdef QT_OPENGL_SUPPORT
-    if (glw)
-        glw->setGeometry(0, 0, e->size().width()-1, e->size().height()-1);
+#if QT_CONFIG(opengl)
+    if (m_glWidget)
+        m_glWidget->setGeometry(0, 0, e->size().width()-1, e->size().height()-1);
 #endif
     QWidget::resizeEvent(e);
 }
@@ -312,32 +330,40 @@ void ArthurFrame::showSource()
 
     QString contents;
     if (m_sourceFileName.isEmpty()) {
-        contents = QString("No source for widget: '%1'").arg(objectName());
+        contents = tr("No source for widget: '%1'").arg(objectName());
     } else {
         QFile f(m_sourceFileName);
         if (!f.open(QFile::ReadOnly))
-            contents = QString("Could not open file: '%1'").arg(m_sourceFileName);
+            contents = tr("Could not open file: '%1'").arg(m_sourceFileName);
         else
             contents = f.readAll();
     }
 
-    contents.replace('&', "&amp;");
-    contents.replace('<', "&lt;");
-    contents.replace('>', "&gt;");
-
-    QStringList keywords;
-    keywords << "for " << "if " << "switch " << " int " << "#include " << "const"
-             << "void " << "uint " << "case " << "double " << "#define " << "static"
-             << "new" << "this";
-
-    foreach (QString keyword, keywords)
+    contents.replace(QLatin1Char('&'), QStringLiteral("&amp;"));
+    contents.replace(QLatin1Char('<'), QStringLiteral("&lt;"));
+    contents.replace(QLatin1Char('>'), QStringLiteral("&gt;"));
+
+    static const QString keywords[] = {
+        QStringLiteral("for "),      QStringLiteral("if "),
+        QStringLiteral("switch "),   QStringLiteral(" int "),
+        QStringLiteral("#include "), QStringLiteral("const"),
+        QStringLiteral("void "),     QStringLiteral("uint "),
+        QStringLiteral("case "),     QStringLiteral("double "),
+        QStringLiteral("#define "),  QStringLiteral("static"),
+        QStringLiteral("new"),       QStringLiteral("this")
+    };
+
+    for (const QString &keyword : keywords)
         contents.replace(keyword, QLatin1String("<font color=olive>") + keyword + QLatin1String("</font>"));
-    contents.replace("(int ", "(<font color=olive><b>int </b></font>");
+    contents.replace(QStringLiteral("(int "), QStringLiteral("(<font color=olive><b>int </b></font>"));
 
-    QStringList ppKeywords;
-    ppKeywords << "#ifdef" << "#ifndef" << "#if" << "#endif" << "#else";
+    static const QString ppKeywords[] = {
+        QStringLiteral("#ifdef"), QStringLiteral("#ifndef"),
+        QStringLiteral("#if"),    QStringLiteral("#endif"),
+        QStringLiteral("#else")
+    };
 
-    foreach (QString keyword, ppKeywords)
+    for (const QString &keyword : ppKeywords)
         contents.replace(keyword, QLatin1String("<font color=navy>") + keyword + QLatin1String("</font>"));
 
     contents.replace(QRegularExpression("(\\d\\d?)"), QLatin1String("<font color=navy>\\1</font>"));
@@ -348,12 +374,10 @@ void ArthurFrame::showSource()
     QRegularExpression stringLiteralRe("(\".+?\")");
     contents.replace(stringLiteralRe, QLatin1String("<font color=green>\\1</font>"));
 
-    QString html = contents;
-    html.prepend("<html><pre>");
-    html.append("</pre></html>");
+    const QString html = QStringLiteral("<html><pre>") + contents + QStringLiteral("</pre></html>");
 
     QTextBrowser *sourceViewer = new QTextBrowser(0);
-    sourceViewer->setWindowTitle("Source: " + m_sourceFileName.mid(5));
+    sourceViewer->setWindowTitle(tr("Source: %1").arg(m_sourceFileName.midRef(5)));
     sourceViewer->setParent(this, Qt::Dialog);
     sourceViewer->setAttribute(Qt::WA_DeleteOnClose);
     sourceViewer->setLineWrapMode(QTextEdit::NoWrap);
diff --git a/examples/widgets/painting/shared/arthurwidgets.h b/examples/widgets/painting/shared/arthurwidgets.h
index d6e1e44b3a..73e1310c0e 100644
--- a/examples/widgets/painting/shared/arthurwidgets.h
+++ b/examples/widgets/painting/shared/arthurwidgets.h
@@ -56,42 +56,13 @@
 #include <QPushButton>
 #include <QGroupBox>
 
-#if defined(QT_OPENGL_SUPPORT)
-#include <QGLWidget>
-#include <QEvent>
-class GLWidget : public QGLWidget
-{
-public:
-    GLWidget(QWidget *parent)
-        : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
-    {
-        setAttribute(Qt::WA_AcceptTouchEvents);
-    }
-    void disableAutoBufferSwap() { setAutoBufferSwap(false); }
-    void paintEvent(QPaintEvent *) override { parentWidget()->update(); }
-protected:
-    bool event(QEvent *event) override
-    {
-        switch (event->type()) {
-        case QEvent::TouchBegin:
-        case QEvent::TouchUpdate:
-        case QEvent::TouchEnd:
-            event->ignore();
-            return false;
-            break;
-        default:
-            break;
-        }
-        return QGLWidget::event(event);
-    }
-};
-#endif
-
+QT_FORWARD_DECLARE_CLASS(QOpenGLWindow)
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 QT_FORWARD_DECLARE_CLASS(QTextEdit)
 QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 
 class ArthurFrame : public QWidget
+
 {
     Q_OBJECT
 public:
@@ -107,9 +78,8 @@ public:
     void loadSourceFile(const QString &fileName);
 
     bool preferImage() const { return m_prefer_image; }
-
-#if defined(QT_OPENGL_SUPPORT)
-    QGLWidget *glWidget() const { return glw; }
+#if QT_CONFIG(opengl)
+    QOpenGLWindow *glWindow() const { return m_glWindow; }
 #endif
 
 public slots:
@@ -117,7 +87,7 @@ public slots:
     void setDescriptionEnabled(bool enabled);
     void showSource();
 
-#if defined(QT_OPENGL_SUPPORT)
+#if QT_CONFIG(opengl)
     void enableOpenGL(bool use_opengl);
     bool usesOpenGL() { return m_use_opengl; }
 #endif
@@ -129,8 +99,10 @@ protected:
     void paintEvent(QPaintEvent *) override;
     void resizeEvent(QResizeEvent *) override;
 
-#if defined(QT_OPENGL_SUPPORT)
-    GLWidget *glw;
+#if QT_CONFIG(opengl)
+    virtual void createGlWindow();
+    QOpenGLWindow *m_glWindow;
+    QWidget *m_glWidget;
     bool m_use_opengl;
 #endif
     QPixmap m_tile;
diff --git a/examples/widgets/painting/shared/fbopaintdevice.cpp b/examples/widgets/painting/shared/fbopaintdevice.cpp
new file mode 100644
index 0000000000..8207090cc8
--- /dev/null
+++ b/examples/widgets/painting/shared/fbopaintdevice.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "fbopaintdevice.h"
+
+#include <QOffscreenSurface>
+#include <QOpenGLFunctions>
+
+QFboPaintDevice::QFboPaintDevice(const QSize& size, bool flipped, bool clearOnInit,
+                                 QOpenGLFramebufferObject::Attachment attachment)
+        : QOpenGLPaintDevice(size)
+{
+    QOpenGLFramebufferObjectFormat format;
+    format.setAttachment(attachment);
+    format.setSamples(4);
+    m_framebufferObject = new QOpenGLFramebufferObject(size, format);
+    QOffscreenSurface *surface = new QOffscreenSurface();
+    surface->create();
+    m_surface = surface;
+    setPaintFlipped(flipped);
+    if (clearOnInit) {
+        m_framebufferObject->bind();
+
+        context()->functions()->glClearColor(0, 0, 0, 0);
+        context()->functions()->glClear(GL_COLOR_BUFFER_BIT);
+    }
+}
+
+QFboPaintDevice::~QFboPaintDevice()
+{
+    delete m_framebufferObject;
+    delete m_surface;
+}
+
+void QFboPaintDevice::ensureActiveTarget()
+{
+    if (QOpenGLContext::currentContext() != context())
+        context()->makeCurrent(m_surface);
+
+    m_framebufferObject->bind();
+}
+
+GLuint QFboPaintDevice::takeTexture()
+{
+    // We have multisamples so we can't just forward takeTexture().
+    QOpenGLFramebufferObject resolvedFbo(m_framebufferObject->size(), m_framebufferObject->attachment());
+    QOpenGLFramebufferObject::blitFramebuffer(&resolvedFbo, m_framebufferObject);
+    return resolvedFbo.takeTexture();
+}
+
+QImage QFboPaintDevice::toImage() const
+{
+    QOpenGLContext* currentContext = QOpenGLContext::currentContext();
+    QSurface* currentSurface = currentContext ? currentContext->surface() : 0;
+
+    context()->makeCurrent(m_surface);
+
+    QImage image = m_framebufferObject->toImage(!paintFlipped());
+
+    if (currentContext)
+        currentContext->makeCurrent(currentSurface);
+    else
+        context()->doneCurrent();
+
+    return image;
+}
diff --git a/examples/widgets/painting/shared/fbopaintdevice.h b/examples/widgets/painting/shared/fbopaintdevice.h
new file mode 100644
index 0000000000..78451af895
--- /dev/null
+++ b/examples/widgets/painting/shared/fbopaintdevice.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QFBOPAINTDEVICE_H
+#define QFBOPAINTDEVICE_H
+
+#ifndef QT_NO_OPENGL
+
+#include <QImage>
+#include <QOpenGLFramebufferObject>
+#include <QOpenGLPaintDevice>
+#include <QSurface>
+
+class QFboPaintDevice : public QOpenGLPaintDevice {
+public:
+    QFboPaintDevice(const QSize&, bool flipped = false, bool clearOnInit = true,
+        QOpenGLFramebufferObject::Attachment = QOpenGLFramebufferObject::CombinedDepthStencil);
+    ~QFboPaintDevice();
+
+    // QOpenGLPaintDevice:
+    void ensureActiveTarget() override;
+
+    bool isValid() const { return m_framebufferObject->isValid(); }
+    GLuint handle() const { return m_framebufferObject->handle(); }
+    GLuint takeTexture();
+    QImage toImage() const;
+
+    bool bind() { return m_framebufferObject->bind(); }
+    bool release() { return m_framebufferObject->release(); }
+    QSize size() const { return m_framebufferObject->size(); }
+
+    QOpenGLFramebufferObject* framebufferObject() { return m_framebufferObject; }
+    const QOpenGLFramebufferObject* framebufferObject() const { return m_framebufferObject; }
+
+    static bool isSupported() { return QOpenGLFramebufferObject::hasOpenGLFramebufferObjects(); }
+
+private:
+    QOpenGLFramebufferObject *m_framebufferObject;
+    QSurface* m_surface;
+};
+
+#endif // QT_NO_OPENGL
+
+#endif // QFBOPAINTDEVICE_H
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
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri
index 362cc6819c..cb08b00348 100644
--- a/examples/widgets/painting/shared/shared.pri
+++ b/examples/widgets/painting/shared/shared.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 
-qtHaveModule(opengl)|qtConfig(opengles2)  {
-    DEFINES += QT_OPENGL_SUPPORT
-    QT += opengl widgets
+qtConfig(opengl) {
+    SOURCES += $$PWD/fbopaintdevice.cpp
+    HEADERS += $$PWD/fbopaintdevice.h
 }
 
 SOURCES += \