summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-02-10 12:02:57 +0100
committerMichal Klocek <michal.klocek@qt.io>2021-04-13 09:32:55 +0200
commit919dd97e835f469609a0710eb91f829a6d70e88c (patch)
tree90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /examples
parent29d45bf2d105b43d8cedc923869960091771d2a1 (diff)
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>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro6
-rw-r--r--examples/webengine/customdialogs/customdialogs.pro2
-rw-r--r--examples/webengine/lifecycle/lifecycle.pro2
-rw-r--r--examples/webengine/minimal/minimal.pro2
-rw-r--r--examples/webengine/quicknanobrowser/main.cpp2
-rw-r--r--examples/webengine/quicknanobrowser/quicknanobrowser.pro2
-rw-r--r--examples/webengine/recipebrowser/recipebrowser.pro2
-rw-r--r--examples/webengine/webengineaction/webengineaction.pro2
8 files changed, 10 insertions, 10 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index a0245a869..f36b98904 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,13 +1,13 @@
include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
-include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri)
+include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri)
include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri)
include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri)
include($$QTWEBENGINE_OUT_ROOT/src/pdfwidgets/qtpdfwidgets-config.pri)
QT_FOR_CONFIG += \
buildtools-private \
- webengine-private \
+ webenginequick-private \
webenginewidgets-private \
pdf-private \
pdfwidgets-private
@@ -15,7 +15,7 @@ QT_FOR_CONFIG += \
TEMPLATE=subdirs
qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
- qtConfig(webengine-qml): SUBDIRS += webengine
+ qtConfig(webengine-quick): SUBDIRS += webengine
qtConfig(webengine-widgets): SUBDIRS += webenginewidgets
}
diff --git a/examples/webengine/customdialogs/customdialogs.pro b/examples/webengine/customdialogs/customdialogs.pro
index 5861f3af7..8555318ad 100644
--- a/examples/webengine/customdialogs/customdialogs.pro
+++ b/examples/webengine/customdialogs/customdialogs.pro
@@ -1,4 +1,4 @@
-QT += webengine
+QT += webenginequick
HEADERS += \
server.h
diff --git a/examples/webengine/lifecycle/lifecycle.pro b/examples/webengine/lifecycle/lifecycle.pro
index 74fbf23c1..6e807eb3d 100644
--- a/examples/webengine/lifecycle/lifecycle.pro
+++ b/examples/webengine/lifecycle/lifecycle.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT += quickcontrols2 webengine
+QT += quickcontrols2 webenginequick
SOURCES += main.cpp
diff --git a/examples/webengine/minimal/minimal.pro b/examples/webengine/minimal/minimal.pro
index 23ce01d5b..9ec75318a 100644
--- a/examples/webengine/minimal/minimal.pro
+++ b/examples/webengine/minimal/minimal.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT += webengine
+QT += webenginequick
SOURCES += main.cpp
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index d09abba3c..f804c0d14 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 <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
static QUrl startupUrl()
{
diff --git a/examples/webengine/quicknanobrowser/quicknanobrowser.pro b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
index 922cf79e2..6217f2ef5 100644
--- a/examples/webengine/quicknanobrowser/quicknanobrowser.pro
+++ b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
@@ -15,7 +15,7 @@ OTHER_FILES += ApplicationRoot.qml \
RESOURCES += resources.qrc
-QT += qml quick webengine
+QT += qml quick webenginequick
qtHaveModule(widgets) {
QT += widgets # QApplication is required to get native styling with QtQuickControls
diff --git a/examples/webengine/recipebrowser/recipebrowser.pro b/examples/webengine/recipebrowser/recipebrowser.pro
index 2c2145fc6..3926a136c 100644
--- a/examples/webengine/recipebrowser/recipebrowser.pro
+++ b/examples/webengine/recipebrowser/recipebrowser.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT += quick qml quickcontrols2 webengine
+QT += quick qml quickcontrols2 webenginequick
cross_compile {
posix|qnx|linux: DEFINES += QTWEBENGINE_RECIPE_BROWSER_EMBEDDED
diff --git a/examples/webengine/webengineaction/webengineaction.pro b/examples/webengine/webengineaction/webengineaction.pro
index 13cc4602d..aeed568fb 100644
--- a/examples/webengine/webengineaction/webengineaction.pro
+++ b/examples/webengine/webengineaction/webengineaction.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT += webengine
+QT += webenginequick
SOURCES += main.cpp