From 868def84fe800aaba937159814388249ebbaf914 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 28 Oct 2014 15:40:49 +0100 Subject: [PATCH] qmlscene: Simplify context sharing logic. We can use the new application attribute for this now. Change-Id: Ia0a6d13d36316ec9becfb5d3251b8461ac73a2d0 Reviewed-by: Laszlo Agocs --- tools/qmlscene/main.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index bc339ae..2a86b72 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -405,6 +405,9 @@ int main(int argc, char ** argv) } } + // QtWebEngine needs a shared context in order for the GPU thread to + // upload textures. + QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, options.contextSharing); #ifdef QT_WIDGETS_LIB QApplication app(argc, argv); #else @@ -443,15 +446,6 @@ int main(int argc, char ** argv) displayFileDialog(&options); #endif - // QWebEngine needs a shared context in order for the GPU thread to - // upload textures. - QScopedPointer shareContext; - if (options.contextSharing) { - shareContext.reset(new QOpenGLContext); - shareContext->create(); - qt_gl_set_global_share_context(shareContext.data()); - } - int exitCode = 0; if (!options.file.isEmpty()) { -- 2.7.4