summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-06-01 17:26:36 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-15 17:29:50 +0000
commit5f4fb14cb0f6b443885e79516f450853e44f650d (patch)
treeaefc9b4cea1e64ea51f02c5d99ce22206d87488c /examples
parent8d23c52719a23dea77a75a959ca3462e38de259c (diff)
Fix QWebEngineQuick namespace for webenginequick module
This is followup change for QtWebEngineQuick rename. [ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick QtWebEngine::initialize() is now QtWebEnigneQuick::initialize() Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5f723fe7469ac9ce3373dbcd3eb0978595271514) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/webengine/customdialogs/main.cpp4
-rw-r--r--examples/webengine/lifecycle/main.cpp4
-rw-r--r--examples/webengine/minimal/doc/src/minimal.qdoc4
-rw-r--r--examples/webengine/minimal/main.cpp4
-rw-r--r--examples/webengine/quicknanobrowser/main.cpp4
-rw-r--r--examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc2
-rw-r--r--examples/webengine/recipebrowser/main.cpp4
-rw-r--r--examples/webengine/webengineaction/main.cpp4
8 files changed, 15 insertions, 15 deletions
diff --git a/examples/webengine/customdialogs/main.cpp b/examples/webengine/customdialogs/main.cpp
index e3c4ad085..463da44f6 100644
--- a/examples/webengine/customdialogs/main.cpp
+++ b/examples/webengine/customdialogs/main.cpp
@@ -49,7 +49,7 @@
****************************************************************************/
#include "server.h"
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
#include <QNetworkProxy>
#include <QQmlApplicationEngine>
#include <QTimer>
@@ -66,7 +66,7 @@ typedef QGuiApplication Application;
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
Application app(argc, argv);
diff --git a/examples/webengine/lifecycle/main.cpp b/examples/webengine/lifecycle/main.cpp
index 3972639c5..44deacc46 100644
--- a/examples/webengine/lifecycle/main.cpp
+++ b/examples/webengine/lifecycle/main.cpp
@@ -52,12 +52,12 @@
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickStyle>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:/WebBrowser.qml")));
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc
index 1e629f689..f63d15c8a 100644
--- a/examples/webengine/minimal/doc/src/minimal.qdoc
+++ b/examples/webengine/minimal/doc/src/minimal.qdoc
@@ -44,7 +44,7 @@
In \c main.cpp we use only the QGuiApplication and QQmlApplicationEngine
classes. We also include \c qtwebengineglobal.h to be able to use
- \l{QtWebEngine::initialize}.
+ \l{QtWebEngineQuick::initialize}.
\quotefromfile webengine/minimal/main.cpp
\skipto #include
@@ -56,7 +56,7 @@
\l{WebEngineProfile::cachePath} and
\l{WebEngineProfile::persistentStoragePath}).
- Next, we call \l{QtWebEngine::initialize}, which makes sure that OpenGL
+ Next, we call \l{QtWebEngineQuick::initialize}, which makes sure that OpenGL
contexts can be shared between the main process and the dedicated renderer
process (\c QtWebEngineProcess). This method needs to be called before
any OpenGL context is created.
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp
index fde716451..cf11eea26 100644
--- a/examples/webengine/minimal/main.cpp
+++ b/examples/webengine/minimal/main.cpp
@@ -50,13 +50,13 @@
#include <QGuiApplication>
#include <QQmlApplicationEngine>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine;
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index 4c4c80390..859856d92 100644
--- a/examples/webengine/quicknanobrowser/main.cpp
+++ b/examples/webengine/quicknanobrowser/main.cpp
@@ -59,7 +59,7 @@ typedef QGuiApplication Application;
#endif
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
static QUrl startupUrl()
{
@@ -79,7 +79,7 @@ static QUrl startupUrl()
int main(int argc, char **argv)
{
QCoreApplication::setOrganizationName("QtExamples");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
Application app(argc, argv);
diff --git a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
index 6e1ed84e3..e777c612a 100644
--- a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
+++ b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
@@ -46,7 +46,7 @@
\section1 C++ Code
In \c main.cpp, we use the \l{QGuiApplication} and \l{QQmlApplicationEngine}
- classes to set up and load the main QML file. We call \l{QtWebEngine::initialize} so we can use
+ classes to set up and load the main QML file. We call \l{QtWebEngineQuick::initialize} so we can use
\l{WebEngineView} in our QML code. We set the default Qt Quick Controls 2 style
to the Material style, so we do not have to specify it for each new item we add. Finally, we use
a C++ define to check whether the application is compiled for an embedded platform.
diff --git a/examples/webengine/recipebrowser/main.cpp b/examples/webengine/recipebrowser/main.cpp
index b5e5224ed..5e9281ce5 100644
--- a/examples/webengine/recipebrowser/main.cpp
+++ b/examples/webengine/recipebrowser/main.cpp
@@ -52,12 +52,12 @@
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickStyle>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);
diff --git a/examples/webengine/webengineaction/main.cpp b/examples/webengine/webengineaction/main.cpp
index b0ef0848a..a30749ebe 100644
--- a/examples/webengine/webengineaction/main.cpp
+++ b/examples/webengine/webengineaction/main.cpp
@@ -50,12 +50,12 @@
#include <QGuiApplication>
#include <QQmlApplicationEngine>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName("QtExamples");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QGuiApplication app(argc, argv);