diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-28 15:36:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-04 13:49:51 +0200 |
| commit | 82e4ee03918a8abef4479ae67f259bfae4e6b79c (patch) | |
| tree | c77602160612f0affc7090ac0da30b119255dafd /tools/qmlscene | |
| parent | 841e81c7bd184969ae93c30b6f5730b78b54211a (diff) | |
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>
Diffstat (limited to 'tools/qmlscene')
| -rw-r--r-- | tools/qmlscene/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |