diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp index b17516ad6..b1a8f7b78 100644 --- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp @@ -36,10 +36,14 @@ #include "qtwebenginewidgetsglobal.h" -#include "qtwebengineglobal.h" #include <QCoreApplication> #include <QOpenGLContext> +namespace QtWebEngineCore +{ + extern void initialize(); +} + QT_BEGIN_NAMESPACE static void initialize() { @@ -52,7 +56,7 @@ static void initialize() return; } #endif - qAddPreRoutine(QtWebEngine::initialize); + qAddPreRoutine(QtWebEngineCore::initialize); } Q_CONSTRUCTOR_FUNCTION(initialize) |