diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-12-11 12:41:06 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-12-15 09:55:35 +0000 |
| commit | 92261a7883809a2ef17a6ae12b472d3631f303d8 (patch) | |
| tree | 5037f4e97fe8c7ecd72f8b02b8e5553fd3b3b1b8 /src/webenginewidgets | |
| parent | d239b60313f798cf75a4e34a768d9f4a1fc8f92a (diff) | |
Move WebEngine initialization to core library
This means QtWebEngineWidgets no longer needs to depend on and link
to the QML API.
Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 8 | ||||
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp index 4feacf748..1ef6386ad 100644 --- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp @@ -36,13 +36,17 @@ #include "qtwebenginewidgetsglobal.h" -#include "qtwebengineglobal.h" #include <QCoreApplication> +namespace QtWebEngineCore +{ + extern void initialize(); +} + QT_BEGIN_NAMESPACE static void initialize() { - QtWebEngine::initialize(); + QtWebEngineCore::initialize(); } Q_COREAPP_STARTUP_FUNCTION(initialize) diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 4622d0028..5687bffaf 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -3,7 +3,7 @@ TARGET = QtWebEngineWidgets # For our export macros DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB -QT += webengine webenginecore widgets network quick +QT += webenginecore widgets network quick QT_PRIVATE += quick-private gui-private core-private INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api |