From 919dd97e835f469609a0710eb91f829a6d70e88c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 10 Feb 2021 12:02:57 +0100 Subject: Fix 'WebEngine' ambiguity for Qt6 'WebEngine' is a qml module, however name itself is ambiguous. Thefore now with Qt6 and with cmake port name the module as WebEngineQuick. Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/certificateerror/certificateerror.pro | 2 +- tests/auto/quick/dialogs/dialogs.pro | 2 +- tests/auto/quick/dialogs/tst_dialogs.cpp | 2 +- tests/auto/quick/inspectorserver/inspectorserver.pro | 4 ++-- tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 2 +- tests/auto/quick/publicapi/publicapi.pro | 4 ++-- tests/auto/quick/publicapi/tst_publicapi.cpp | 4 ++-- tests/auto/quick/qmltests/qmltests.pro | 6 +++--- tests/auto/quick/qmltests/tst_qmltests.cpp | 2 +- .../qquickwebenginedefaultsurfaceformat.pro | 2 +- .../quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp | 2 +- tests/auto/quick/qquickwebengineview/qquickwebengineview.pro | 2 +- tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 8 ++++---- .../qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro | 2 +- tests/auto/quick/qtbug-70248/qtbug-70248.pro | 2 +- tests/auto/quick/quick.pro | 6 +++--- tests/auto/quick/shared/util.h | 3 ++- tests/auto/quick/tests.pri | 6 +++--- 18 files changed, 31 insertions(+), 30 deletions(-) (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/certificateerror/certificateerror.pro b/tests/auto/quick/certificateerror/certificateerror.pro index 27d5a3cc1..22c1275e6 100644 --- a/tests/auto/quick/certificateerror/certificateerror.pro +++ b/tests/auto/quick/certificateerror/certificateerror.pro @@ -1,6 +1,6 @@ include(../tests.pri) include(../../shared/https.pri) -QT *= webenginecore-private webengine webengine-private +QT *= webenginecore-private webenginequick webenginequick-private HEADERS += $$PWD/testhandler.h SOURCES += $$PWD/testhandler.cpp RESOURCES += certificateerror.qrc diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro index 29d509b20..79952d8ee 100644 --- a/tests/auto/quick/dialogs/dialogs.pro +++ b/tests/auto/quick/dialogs/dialogs.pro @@ -1,5 +1,5 @@ include(../tests.pri) -QT += core-private webengine webengine-private +QT += core-private webenginequick webenginequick-private HEADERS += \ server.h \ diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp index 8f2e79d3b..97a39ed01 100644 --- a/tests/auto/quick/dialogs/tst_dialogs.cpp +++ b/tests/auto/quick/dialogs/tst_dialogs.cpp @@ -30,7 +30,7 @@ #include "server.h" #include "util.h" -#include +#include #include #include diff --git a/tests/auto/quick/inspectorserver/inspectorserver.pro b/tests/auto/quick/inspectorserver/inspectorserver.pro index fdc213f38..5110a3ae9 100644 --- a/tests/auto/quick/inspectorserver/inspectorserver.pro +++ b/tests/auto/quick/inspectorserver/inspectorserver.pro @@ -1,4 +1,4 @@ include(../tests.pri) -QT += webengine -QT_PRIVATE += core-private webengine-private webenginecore-private +QT += webenginequick +QT_PRIVATE += core-private webenginequick-private webenginecore-private DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp index a3c118695..bc5aed9ef 100644 --- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp +++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #define INSPECTOR_SERVER_PORT "23654" static const QUrl s_inspectorServerHttpBaseUrl("http://localhost:" INSPECTOR_SERVER_PORT); diff --git a/tests/auto/quick/publicapi/publicapi.pro b/tests/auto/quick/publicapi/publicapi.pro index c56fd2503..bb0e03f65 100644 --- a/tests/auto/quick/publicapi/publicapi.pro +++ b/tests/auto/quick/publicapi/publicapi.pro @@ -1,3 +1,3 @@ include(../tests.pri) -QT += webengine -QT_PRIVATE += core-private webengine-private webenginecore-private +QT += webenginequick +QT_PRIVATE += core-private webenginequick-private webenginecore-private diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index ba76ad757..a4c478991 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -754,7 +754,7 @@ static const QStringList expectedAPI = QStringList() << "QQuickWebEngineView.setActiveFocusOnPress(bool) --> void" << "QQuickWebEngineView.settings --> QQuickWebEngineSettings*" << "QQuickWebEngineView.stop() --> void" -#if QT_CONFIG(webengine_testsupport) +#if QT_CONFIG(webenginequick_testsupport) << "QQuickWebEngineView.testSupport --> QQuickWebEngineTestSupport*" << "QQuickWebEngineView.testSupportChanged() --> void" #endif diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index cc55c1471..984d41064 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 +QT_FOR_CONFIG += webenginequick-private include(../tests.pri) @@ -49,7 +49,7 @@ qtConfig(ssl) { include(../../shared/http.pri) } -qtConfig(webengine-testsupport) { +qtConfig(webenginequick-testsupport) { QML_TESTS += \ $$PWD/data/tst_favicon.qml \ $$PWD/data/tst_faviconDownload.qml \ diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 8423df1bd..906de29ad 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "qt_webengine_quicktest.h" diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro index 699186741..092973032 100644 --- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro +++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro @@ -1,6 +1,6 @@ include(../tests.pri) exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += core-private webengine-private webenginecore-private +QT_PRIVATE += core-private webenginequick-private webenginecore-private HEADERS += ../shared/util.h diff --git a/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp index db7c2ad6e..ea0469aef 100644 --- a/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp +++ b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include class tst_QQuickWebEngineProfile : public QObject { Q_OBJECT diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro index 38c130aa3..ba3737108 100644 --- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro +++ b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro @@ -1,6 +1,6 @@ include(../tests.pri) exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += core_private gui-private webengine-private webenginecore-private +QT_PRIVATE += core_private gui-private webenginequick-private webenginecore-private HEADERS += ../shared/util.h diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 005dd2dd3..30441ac11 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -37,11 +37,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro index a0ee3fd89..be6296f5e 100644 --- a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro +++ b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro @@ -1,4 +1,4 @@ include(../tests.pri) CONFIG -= testcase # remove, once this passes in the CI exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc -QT_PRIVATE += webengine-private gui-private webenginecore-private +QT_PRIVATE += webenginequick-private gui-private webenginecore-private diff --git a/tests/auto/quick/qtbug-70248/qtbug-70248.pro b/tests/auto/quick/qtbug-70248/qtbug-70248.pro index e1b18bc16..7223dcfa0 100644 --- a/tests/auto/quick/qtbug-70248/qtbug-70248.pro +++ b/tests/auto/quick/qtbug-70248/qtbug-70248.pro @@ -1,5 +1,5 @@ include(../tests.pri) -QT += webengine webengine-private +QT += webenginequick webenginequick-private RESOURCES += \ test.qrc diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 4648b2f64..1c1bf2ba9 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 +QT_FOR_CONFIG += webenginequick-private TEMPLATE = subdirs @@ -13,7 +13,7 @@ SUBDIRS += \ qtbug-70248 \ certificateerror -qtConfig(webengine-testsupport) { +qtConfig(webenginequick-testsupport) { SUBDIRS += qquickwebengineviewgraphics } diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h index 910522b32..34afbbb45 100644 --- a/tests/auto/quick/shared/util.h +++ b/tests/auto/quick/shared/util.h @@ -34,8 +34,9 @@ #include #include #include -#include +#include #include +#include #include #if !defined(TESTS_SOURCE_DIR) diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri index 1bf69da43..8cf4c0af5 100644 --- a/tests/auto/quick/tests.pri +++ b/tests/auto/quick/tests.pri @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093 -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093 +QT_FOR_CONFIG += webenginequick-private TEMPLATE = app @@ -13,7 +13,7 @@ INCLUDEPATH += \ $$PWD \ ../shared -QT += testlib network quick webengine +QT += testlib network quick webenginequick # This define is used by some tests to look up resources in the source tree DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\" -- cgit v1.2.3