diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-11-10 15:21:50 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-20 10:46:54 +0100 |
| commit | c8418581e5f2c492ccdac7951ed648d78357f979 (patch) | |
| tree | af2a0bfa1ffb1958aaed2906bca98df7bb9e0626 /src/core/api | |
| parent | 739e276c67d08a156ba426f12094f3d08515d56a (diff) | |
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>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/core_api.pro | 2 | ||||
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 22 |
2 files changed, 23 insertions, 1 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) |