From 919dd97e835f469609a0710eb91f829a6d70e88c Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
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 <allan.jensen@qt.io>
---
 tests/auto/quick/qmltests/qmltests.pro     | 6 +++---
 tests/auto/quick/qmltests/tst_qmltests.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/auto/quick/qmltests')

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 <QtCore/QScopedPointer>
 #include <QTemporaryDir>
 #include <QtQuickTest/quicktest.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QQmlEngine>
 #include "qt_webengine_quicktest.h"
 
-- 
cgit v1.2.3