Remove unnecessary private header includes

Most importantly, get rid of QOpenGLContextPrivate::globalShareContext
which will be removed before the final.

Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

11 files changed, 10 insertions, 14 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 7d9f85dc4a5c3474e7116abb26697cee280eca9
+Subproject e7cb808b6fcb765ad503068fa47c165c29a7570
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 39514aea6..9e97e3226 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -47,7 +47,6 @@
 #include <QGuiApplication>
 #include <QScreen>
 #include <QWindow>
-#include <qpa/qplatformnativeinterface.h>
 
 #if defined(OS_ANDROID)
 #include "media/video/capture/fake_video_capture_device.h"
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index f2329d779..c50d56df4 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -11,7 +11,7 @@ TEMPLATE = lib
 # gyp/ninja will take care of the compilation, qmake/make will finish with linking and install.
 TARGET = QtWebEngineCore
 QT += qml quick
-QT_PRIVATE += qml-private quick-private gui-private core-private
+QT_PRIVATE += gui-private
 
 # Defining keywords such as 'signal' clashes with the chromium code base.
 DEFINES += QT_NO_KEYWORDS \
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 1548a4d3f..320ebd0f8 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -4,7 +4,7 @@ TARGET = QtWebEngineCore
 CMAKE_MODULE_TESTS = "-"
 
 QT += qml quick
-QT_PRIVATE += qml-private quick-private gui-private core-private
+QT_PRIVATE += gui-private
 
 # Look for linking information produced by gyp for our target according to core_generated.gyp
 !include($$OUT_PWD/$$getConfigDir()/$${TARGET}_linking.pri) {
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
index 4c196d969..6aec2d3b3 100644
--- a/src/core/gl_context_qt.cpp
+++ b/src/core/gl_context_qt.cpp
@@ -37,12 +37,10 @@
 #include "gl_context_qt.h"
 
 #include <QGuiApplication>
+#include <QOpenGLContext>
 #include <QThread>
-#include "ui/gl/gl_context_egl.h"
-
-#include <private/qopenglcontext_p.h>
-#include <private/qsgcontext_p.h>
 #include <qpa/qplatformnativeinterface.h>
+#include "ui/gl/gl_context_egl.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ -50,13 +48,14 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
 GLContextHelper* GLContextHelper::contextHelper = 0;
 
 namespace {
 
 inline void *resourceForContext(const QByteArray &resource)
 {
-    return qApp->platformNativeInterface()->nativeResourceForContext(resource, QOpenGLContextPrivate::globalShareContext());
+    return qApp->platformNativeInterface()->nativeResourceForContext(resource, qt_gl_global_share_context());
 }
 
 inline void *resourceForIntegration(const QByteArray &resource)
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 6510680ca..72758cbff 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -43,7 +43,6 @@
 #if !defined(OS_MACOSX)
 
 #include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
 #include "gl_context_qt.h"
 #include "qtwebenginecoreglobal.h"
 
diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
index a9c175a23..ca48da46e 100644
--- a/src/core/surface_factory_qt.cpp
+++ b/src/core/surface_factory_qt.cpp
@@ -43,7 +43,6 @@
 #include "ui/gl/gl_implementation.h"
 
 #include <QGuiApplication>
-#include <qpa/qplatformnativeinterface.h>
 
 #if defined(USE_OZONE) || defined(OS_ANDROID)
 #include <EGL/egl.h>
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro
index 565d931ba..36162e359 100644
--- a/src/webengine/plugin/experimental/experimental.pro
+++ b/src/webengine/plugin/experimental/experimental.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtWebEngine/experimental
 IMPORT_VERSION = 1.0
 
 QT += webengine qml quick
-QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
+QT_PRIVATE += webengine-private
 
 INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api
 
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro
index cee05ba9b..5682e90ed 100644
--- a/src/webengine/plugin/plugin.pro
+++ b/src/webengine/plugin/plugin.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtWebEngine
 IMPORT_VERSION = 1.0
 
 QT += webengine qml quick
-QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
+QT_PRIVATE += webengine-private
 
 INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api $$QTWEBENGINE_ROOT/include/QtWebEngine
 
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index 1278fdf11..6f48e9d49 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -6,7 +6,7 @@ CMAKE_MODULE_TESTS = "-"
 DEFINES += QT_BUILD_WEBENGINE_LIB
 
 QT += qml quick
-QT_PRIVATE += webenginecore qml-private quick-private gui-private core-private
+QT_PRIVATE += webenginecore quick-private
 
 QMAKE_DOCS = $$PWD/doc/qtwebengine.qdocconf
 
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 37a076307..71240cbaf 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -6,7 +6,7 @@ CMAKE_MODULE_TESTS = "-"
 DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB
 
 QT += webengine widgets network quick
-QT_PRIVATE += webenginecore widgets-private quick-private gui-private network-private core-private
+QT_PRIVATE += webenginecore
 
 QMAKE_DOCS = $$PWD/doc/qtwebenginewidgets.qdocconf