diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2014-07-30 18:35:06 +0200 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-08-04 16:55:58 +0200 |
commit | 35d66ce48248f07759cbe2a17437198e8e1948ed (patch) | |
tree | 3fe3f58c867937885382417526ab8aec7e27df5d /src | |
parent | a19baad6297c5ff043f531e1bf664e7039d17fe1 (diff) |
s/QWebEngine/QtWebEngine/g
and make it a namespace
Change-Id: I15c1af8c7d0d8ab213cdf7945109263fe461d2ac
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 | ||||
-rw-r--r-- | src/webengine/api/qtwebengineglobal.cpp | 8 | ||||
-rw-r--r-- | src/webengine/api/qtwebengineglobal.h | 7 | ||||
-rw-r--r-- | src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp | 5 |
4 files changed, 15 insertions, 7 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 347636fe5..259392ca8 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 0a1d6a449..baa335740 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 f5fa479d9..e0842b009 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 cffdb74bc..7d3954772 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 |