summaryrefslogtreecommitdiffstats
path: root/tests
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 /tests
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 'tests')
-rw-r--r--tests/auto/quick/inspectorserver/tst_inspectorserver.cpp2
-rw-r--r--tests/auto/quick/qmltests/tst_qmltests.cpp2
-rw-r--r--tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp2
-rw-r--r--tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp2
-rw-r--r--tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp2
-rw-r--r--tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp4
-rw-r--r--tests/auto/util/qt_webengine_quicktest.h2
-rw-r--r--tests/auto/util/quickutil.h2
-rw-r--r--tests/manual/quick/touchbrowser/main.cpp4
-rw-r--r--tests/quicktestbrowser/main.cpp4
10 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index ef8e74a31..2879895ca 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -62,7 +62,7 @@ private:
tst_InspectorServer::tst_InspectorServer()
{
qputenv("QTWEBENGINE_REMOTE_DEBUGGING", INSPECTOR_SERVER_PORT);
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
prepareWebViewComponent();
}
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index d9be0a773..689c47995 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
if (!QCoreApplication::instance()) {
app.reset(new Application(w_argc, const_cast<char **>(w_argv.data())));
}
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir");
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
index 99ed8a061..d75157026 100644
--- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
+++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
@@ -116,7 +116,7 @@ void tst_QQuickWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat()
QSurfaceFormat::setDefaultFormat( format );
QGuiApplication app(argc, argv);
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
initEngineAndViewComponent();
initWindow();
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 92ba16760..63dbf0452 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -108,7 +108,7 @@ private:
tst_QQuickWebEngineView::tst_QQuickWebEngineView()
{
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
m_testSourceDirPath = QDir(QT_TESTCASE_SOURCEDIR).canonicalPath();
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index 518ddaa0d..d04a88510 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -33,7 +33,7 @@
#include <QQuickView>
#include <QQuickItem>
#include <QPainter>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
#include <private/qquickwebengineview_p.h>
#include <map>
diff --git a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
index 3dffa1d84..6f48c957f 100644
--- a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
+++ b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
@@ -26,7 +26,7 @@
**
****************************************************************************/
-#include "qtwebengineglobal.h"
+#include "qtwebenginequickglobal.h"
#include <QQuickWebEngineProfile>
#include <QQmlApplicationEngine>
#include <QQuickWindow>
@@ -43,7 +43,7 @@ private slots:
void tst_qtbug_70248::test()
{
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QScopedPointer<QQmlApplicationEngine> engine;
QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
engine.reset(new QQmlApplicationEngine());
diff --git a/tests/auto/util/qt_webengine_quicktest.h b/tests/auto/util/qt_webengine_quicktest.h
index 55ccd9f33..3fba3b905 100644
--- a/tests/auto/util/qt_webengine_quicktest.h
+++ b/tests/auto/util/qt_webengine_quicktest.h
@@ -38,7 +38,7 @@
#endif
#include "qopenglcontext.h"
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/util/quickutil.h b/tests/auto/util/quickutil.h
index cfaf89df9..323fe3df4 100644
--- a/tests/auto/util/quickutil.h
+++ b/tests/auto/util/quickutil.h
@@ -171,7 +171,7 @@ inline QString activeElementId(QQuickWebEngineView *webEngineView)
#define W_QTEST_MAIN(TestObject, params) \
int main(int argc, char *argv[]) \
{ \
- QtWebEngine::initialize(); \
+ QtWebEngineQuick::initialize(); \
\
QList<const char *> w_argv(argc); \
for (int i = 0; i < argc; ++i) \
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index cc83b675a..ffbe81179 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -35,7 +35,7 @@
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
#include <QtQuick/QQuickView>
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
static QUrl startupUrl()
{
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
int qAppArgCount = qargv.size();
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
#if defined(DESKTOP_BUILD)
TouchMockingApplication app(qAppArgCount, qargv.data());
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index 9dc0c2dee..cb21518c9 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -38,7 +38,7 @@ typedef QGuiApplication Application;
#include <QtQml/QQmlApplicationEngine>
#include <QtQml/QQmlContext>
#include <QtQml/QQmlComponent>
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
#include <QtWebEngineQuick/QQuickWebEngineProfile>
#include <QtWebEngineCore/qwebenginecookiestore.h>
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
// Enable dev tools by default for the test browser
if (qgetenv("QTWEBENGINE_REMOTE_DEBUGGING").isNull())
qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "1337");
- QtWebEngine::initialize();
+ QtWebEngineQuick::initialize();
QQmlApplicationEngine appEngine;
Utils utils;