From 92261a7883809a2ef17a6ae12b472d3631f303d8 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 11 Dec 2015 12:41:06 +0100 Subject: 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 --- src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 8 ++++++-- src/webenginewidgets/webenginewidgets.pro | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/webenginewidgets') 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 +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 -- cgit v1.2.3