4 files changed, 6 insertions, 15 deletions
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index 5883574d3..98d836a10 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -1,7 +1,6 @@
 include(../tests.pri)
 
 QT += qmltest
-QT_PRIVATE += quick-private
 
 IMPORTPATH += $$PWD/data
 
diff --git a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp
index 4411107c4..213420b13 100644
--- a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp
@@ -43,7 +43,8 @@
 #include <QQmlContext>
 #include <QQuickView>
 #include <QQuickItem>
-#include <QtQuick/private/qsgcontext_p.h>
+#include <QPainter>
+#include <qtwebengineglobal.h>
 
 class TestView : public QQuickView {
     Q_OBJECT
@@ -111,12 +112,7 @@ void tst_QQuickWebViewGraphics::initTestCase()
 #if defined(TST_QQUICKWEBVIEWGRAPHICS_SOFTWARE)
     qApp->setProperty("QQuickWebEngineView_DisableHardwareAcceleration", QVariant(true));
 #else
-    // This is currently needed by all QtWebEngine application using the HW accelerated QQuickWebView.
-    // It enables sharing between the QOpenGLContext of all QQuickWindows of the application.
-    // We have to do so until we expose a public API for it, or chose enable it by default in Qt 5.3.0.
-    QOpenGLContext *shareContext = new QOpenGLContext;
-    shareContext->create();
-    QSGContext::setSharedOpenGLContext(shareContext);
+    QWebEngine::initialize();
 #endif
 }
 
diff --git a/tests/auto/quick/shared/qt_webengine_quicktest.h b/tests/auto/quick/shared/qt_webengine_quicktest.h
index 92e9889ef..275e40dd2 100644
--- a/tests/auto/quick/shared/qt_webengine_quicktest.h
+++ b/tests/auto/quick/shared/qt_webengine_quicktest.h
@@ -51,7 +51,7 @@
 #endif
 
 #include "qopenglcontext.h"
-#include <QtQuick/private/qsgcontext_p.h>
+#include <qtwebengineglobal.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,11 +72,8 @@ QT_BEGIN_NAMESPACE
         qputenv("QTWEBENGINEPROCESS_PATH", QWP_PATH); \
         if (!QCoreApplication::instance()) \
             app = new Application(argc, argv); \
-        QOpenGLContext *shareContext = new QOpenGLContext(); \
-        shareContext->create(); \
-        QSGContext::setSharedOpenGLContext(shareContext); \
+        QWebEngine::initialize(); \
         int i = quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \
-        delete shareContext; \
         delete app; \
         return i; \
     }
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index c2e47c653..932407e66 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -9,8 +9,7 @@ TARGET = tst_$$TARGET
 SOURCES += $${TARGET}.cpp
 INCLUDEPATH += $$PWD
 
-QT += testlib network quick
-QT_PRIVATE += quick-private gui-private core-private
+QT += testlib network quick webengine
 
 macx: CONFIG -= app_bundle