diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-26 12:21:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 18:36:46 +0200 |
| commit | 3d6d6594b0dd2a8860b8fddd5a58f86c4ebd255c (patch) | |
| tree | 5a9959d433425d8ff1a1d78d1b2506a1fd147770 /examples | |
| parent | 3512a6cfe07cb7108485b3e39d586612aa5ed3d8 (diff) | |
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 <jocelyn.turcotte@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webengine/quicknanobrowser/main.cpp | 9 | ||||
| -rw-r--r-- | examples/webengine/quicknanobrowser/quicknanobrowser.pro | 3 |
2 files changed, 3 insertions, 9 deletions
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 <QtGui/QGuiApplication> typedef QGuiApplication Application; #endif -#include <QtQuick/private/qsgcontext_p.h> +#include <qtwebengineglobal.h> 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 |