diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index f9d867c8d4b4cdc06c16e1d1b78941ece09b209f..d5a4ade5589c76c5c9c55626bda70ecc7cdeace1 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) { Application app(argc, argv); - QWebEngine::initialize(); + QtWebEngine::initialize(); ApplicationEngine appEngine; diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 347636fe52656c81e7c9b590137aa624c04180bc..259392ca838b8459c5cc87ea0b301eeaf6c3a5cc 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -263,7 +263,7 @@ void ShareGroupQtQuick::AboutToAddFirstContext() // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering. QOpenGLContext *shareContext = QOpenGLContextPrivate::globalShareContext(); if (!shareContext) { - qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QWebEngine::initialize() in your main() function."); + qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function."); } m_shareContextQtQuick = make_scoped_refptr(new QtShareGLContext(shareContext)); } diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp index 0a1d6a449987048b3d57f7ffbe99401c42d8cdf4..baa33574038582f993123565a59c312c2dc08832 100644 --- a/src/webengine/api/qtwebengineglobal.cpp +++ b/src/webengine/api/qtwebengineglobal.cpp @@ -45,6 +45,10 @@ #include <QThread> #include <private/qopenglcontext_p.h> +QT_BEGIN_NAMESPACE + +namespace QtWebEngine { + static QOpenGLContext *shareContext; static void deleteShareContext() @@ -53,7 +57,7 @@ static void deleteShareContext() shareContext = 0; } -void QWebEngine::initialize() +void initialize() { QCoreApplication *app = QCoreApplication::instance(); if (!app) { @@ -73,4 +77,6 @@ void QWebEngine::initialize() qAddPostRoutine(deleteShareContext); QOpenGLContextPrivate::setGlobalShareContext(shareContext); } +} // namespace QtWebEngine +QT_END_NAMESPACE diff --git a/src/webengine/api/qtwebengineglobal.h b/src/webengine/api/qtwebengineglobal.h index f5fa479d9fb22de744a98e72687a0aeb5bc909eb..e0842b009dc00759172658cc765d3837e3e10e5c 100644 --- a/src/webengine/api/qtwebengineglobal.h +++ b/src/webengine/api/qtwebengineglobal.h @@ -55,11 +55,10 @@ QT_BEGIN_NAMESPACE # define Q_WEBENGINE_EXPORT #endif -class Q_WEBENGINE_EXPORT QWebEngine +namespace QtWebEngine { -public: - static void initialize(); -}; + Q_WEBENGINE_EXPORT void initialize(); +} QT_END_NAMESPACE diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp index cffdb74bc33c15359aeb002585ddd244dc53449c..7d3954772a383883ecb873daacab821388530644 100644 --- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp @@ -44,9 +44,12 @@ #include "qtwebengineglobal.h" #include <QCoreApplication> +QT_BEGIN_NAMESPACE static void initialize() { - QWebEngine::initialize(); + QtWebEngine::initialize(); } Q_COREAPP_STARTUP_FUNCTION(initialize) + +QT_END_NAMESPACE diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp index d64ab5d16d6b50b730f8f314803abbc496c1ffee..63e44e59c878f59fc2bdcfc90f6724847d80e7f9 100644 --- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp +++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp @@ -126,7 +126,7 @@ tst_QQuickWebEngineViewGraphics::~tst_QQuickWebEngineViewGraphics() // It is only called once. void tst_QQuickWebEngineViewGraphics::initTestCase() { - QWebEngine::initialize(); + QtWebEngine::initialize(); } void tst_QQuickWebEngineViewGraphics::init() diff --git a/tests/auto/quick/shared/qt_webengine_quicktest.h b/tests/auto/quick/shared/qt_webengine_quicktest.h index 275e40dd2c713f1eccbe08351a036f2b2077e1e5..2fd168e9db11c81122c8d3d0d3438d06b1e2a2f4 100644 --- a/tests/auto/quick/shared/qt_webengine_quicktest.h +++ b/tests/auto/quick/shared/qt_webengine_quicktest.h @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE qputenv("QTWEBENGINEPROCESS_PATH", QWP_PATH); \ if (!QCoreApplication::instance()) \ app = new Application(argc, argv); \ - QWebEngine::initialize(); \ + QtWebEngine::initialize(); \ int i = quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \ delete app; \ return i; \ diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp index 1e592f3e11238e1f93b69be6a47804f2fc96e46a..d8fe01aa1631cd75417ecf0039400c28bd739ea6 100644 --- a/tests/quicktestbrowser/main.cpp +++ b/tests/quicktestbrowser/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) { Application app(argc, argv); - QWebEngine::initialize(); + QtWebEngine::initialize(); ApplicationEngine appEngine;