From 3b1caeb21a66ca939854b897824e9e853ba60b67 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 1 Jul 2014 18:39:14 +0200
Subject: Get rid of QOpenGLContextPrivate::setGlobalShareContex

Manually import qt_(set_)gl_global_share_context from QtGui
instead.

The binary compatibility of those symbols should be maintained
in QtGui, allowing us to avoid depending on private API.

Change-Id: I1f954ec10a793c3195d3aec01409dde1bc767d64
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/content_browser_client_qt.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/core/content_browser_client_qt.cpp')

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 259392ca8..e8fc3adda 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -62,9 +62,13 @@
 #include "web_contents_view_qt.h"
 
 #include <QGuiApplication>
-#include <QtGui/private/qopenglcontext_p.h>
+#include <QOpenGLContext>
 #include <qpa/qplatformnativeinterface.h>
 
+QT_BEGIN_NAMESPACE
+Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
+QT_END_NAMESPACE
+
 namespace {
 
 ContentBrowserClientQt* gBrowserClient = 0; // Owned by ContentMainDelegateQt.
@@ -261,7 +265,7 @@ private:
 void ShareGroupQtQuick::AboutToAddFirstContext()
 {
     // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering.
-    QOpenGLContext *shareContext = QOpenGLContextPrivate::globalShareContext();
+    QOpenGLContext *shareContext = qt_gl_global_share_context();
     if (!shareContext) {
         qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function.");
     }
-- 
cgit v1.2.3