Move share context initialization by loader

Classes are move from widgets to core, this also
requires now initialization in core.

Change-Id: Id7a175c7bbe7b4499d270948503feee2c55ad767
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 23 insertions, 79 deletions

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 68a14514f..c2909d6f0 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -4,7 +4,7 @@ DESTDIR = $$OUT_PWD/$$getConfigDir()
 TEMPLATE = lib
 
 CONFIG += staticlib
-QT += network core-private webenginecoreheaders-private
+QT += network core-private webenginecoreheaders-private quick
 
 # Don't create .prl file for this intermediate library because
 # their contents get used when linking against them, breaking
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index 0e0c4b63b..e6a551e65 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -50,6 +50,7 @@
 #endif
 #endif
 #include <QThread>
+#include <QQuickWindow>
 
 #if QT_CONFIG(opengl)
 QT_BEGIN_NAMESPACE
@@ -206,3 +207,24 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
 #endif // QT_CONFIG(opengl)
 }
 } // namespace QtWebEngineCore
+
+static void initialize()
+{
+#if QT_CONFIG(opengl)
+  if (QCoreApplication::instance()) {
+    // On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash.
+    if (!qt_gl_global_share_context()) {
+      qWarning("Qt WebEngine seems to be initialized from a plugin. Please "
+               "set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute and "
+               "QSGRendererInterface::OpenGLRhi using QQuickWindow::setGraphicsApi "
+               "before constructing QGuiApplication.");
+    }
+    return;
+  }
+  // QCoreApplication is not yet instantiated, ensuring the call will be deferred
+  qAddPreRoutine(QtWebEngineCore::initialize);
+  QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
+#endif // QT_CONFIG(opengl)
+}
+
+Q_CONSTRUCTOR_FUNCTION(initialize)
diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
deleted file mode 100644
index 76f422e9d..000000000
--- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtwebenginewidgetsglobal.h"
-
-#include <QCoreApplication>
-#include <QOpenGLContext>
-#include <QQuickWindow>
-
-namespace QtWebEngineCore
-{
-    extern void initialize();
-}
-
-QT_BEGIN_NAMESPACE
-
-#if QT_CONFIG(opengl)
-Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
-#endif
-
-static void initialize()
-{
-#if QT_CONFIG(opengl)
-    if (QCoreApplication::instance()) {
-        //On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash.
-        if (!qt_gl_global_share_context()) {
-            qWarning("Qt WebEngine seems to be initialized from a plugin. Please "
-                     "set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute "
-                     "before constructing QGuiApplication.");
-        }
-        return;
-    }
-    //QCoreApplication is not yet instantiated, ensuring the call will be deferred
-    qAddPreRoutine(QtWebEngineCore::initialize);
-    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
-#endif // QT_CONFIG(opengl)
-}
-
-Q_CONSTRUCTOR_FUNCTION(initialize)
-
-QT_END_NAMESPACE
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 1b054805b..4b29e4f76 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -12,7 +12,6 @@ QT_PRIVATE += quick-private gui-private core-private widgets-private quickwidget
 INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api
 
 SOURCES = \
-        api/qtwebenginewidgetsglobal.cpp \
         api/qwebengineclientcertificateselection.cpp \
         api/qwebenginehistory.cpp \
         api/qwebenginenotificationpresenter.cpp \