From 3d6d6594b0dd2a8860b8fddd5a58f86c4ebd255c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 26 Mar 2014 12:21:25 +0100 Subject: Centralize OpenGL initialization We now require the user to use QWebEngine::initialize() in main (preferably) and print out an error message if this wasn't set up accordingly. This limits the use of private scene graph API to inside QWebEngine and offers public API for users of the API. Change-Id: I787c176a85ab7784dbc8787d9876960b4872959e Reviewed-by: Jocelyn Turcotte --- examples/webengine/quicknanobrowser/main.cpp | 9 ++------- examples/webengine/quicknanobrowser/quicknanobrowser.pro | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'examples/webengine') diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 6c2f91de6..1e592f3e1 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -47,18 +47,13 @@ typedef QApplication Application; #include typedef QGuiApplication Application; #endif -#include +#include int main(int argc, char **argv) { Application app(argc, argv); - // 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; - shareContext.create(); - QSGContext::setSharedOpenGLContext(&shareContext); + QWebEngine::initialize(); ApplicationEngine appEngine; diff --git a/examples/webengine/quicknanobrowser/quicknanobrowser.pro b/examples/webengine/quicknanobrowser/quicknanobrowser.pro index f1b665932..3628b817e 100644 --- a/examples/webengine/quicknanobrowser/quicknanobrowser.pro +++ b/examples/webengine/quicknanobrowser/quicknanobrowser.pro @@ -10,8 +10,7 @@ OTHER_FILES += quickwindow.qml RESOURCES += resources.qrc -QT += qml quick -QT_PRIVATE += quick-private gui-private core-private +QT += qml quick webengine qtHaveModule(widgets) { QT += widgets # QApplication is required to get native styling with QtQuickControls -- cgit v1.2.3