From 82e4ee03918a8abef4479ae67f259bfae4e6b79c Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 28 Mar 2014 15:36:55 +0100
Subject: Use global context sharing from QtGui instead of QSGContext

This removes QSGContext::sharedOpenGLContext and replace its uses
with QOpenGLContextPrivate::globalShareContext, which is also going
to be used by QOpenGLWidget and QQuickWidget.

Change-Id: I1e296c3e6832f717caaf31ba7d7b27c06249219b
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 tools/qmlscene/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/qmlscene')

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index f128e399b5..7512b5482f 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -58,7 +58,7 @@
 #include <QtQuick/qquickview.h>
 
 #include <private/qabstractanimation_p.h>
-#include <private/qsgcontext_p.h>
+#include <private/qopenglcontext_p.h>
 
 #ifdef QT_WIDGETS_LIB
 #include <QtWidgets/QApplication>
@@ -460,7 +460,7 @@ int main(int argc, char ** argv)
     if (options.contextSharing) {
         shareContext.reset(new QOpenGLContext);
         shareContext->create();
-        QSGContext::setSharedOpenGLContext(shareContext.data());
+        QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
     }
 
     int exitCode = 0;
-- 
cgit v1.2.3