diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-02-10 12:02:57 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-13 09:32:55 +0200 |
| commit | 919dd97e835f469609a0710eb91f829a6d70e88c (patch) | |
| tree | 90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /tests/manual/quick | |
| parent | 29d45bf2d105b43d8cedc923869960091771d2a1 (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 'tests/manual/quick')
| -rw-r--r-- | tests/manual/quick/faviconbrowser/faviconbrowser.pro | 2 | ||||
| -rw-r--r-- | tests/manual/quick/faviconbrowser/main.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/quick/touchbrowser/main.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/quick/touchbrowser/touchbrowser.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/quick/faviconbrowser/faviconbrowser.pro b/tests/manual/quick/faviconbrowser/faviconbrowser.pro index d4368ab3e..d997d6322 100644 --- a/tests/manual/quick/faviconbrowser/faviconbrowser.pro +++ b/tests/manual/quick/faviconbrowser/faviconbrowser.pro @@ -1,4 +1,4 @@ -QT += qml quick webengine +QT += qml quick webenginequick qtHaveModule(widgets) { QT += widgets # QApplication is required to get native styling with QtQuickControls } diff --git a/tests/manual/quick/faviconbrowser/main.cpp b/tests/manual/quick/faviconbrowser/main.cpp index 976d68568..d1faadfa0 100644 --- a/tests/manual/quick/faviconbrowser/main.cpp +++ b/tests/manual/quick/faviconbrowser/main.cpp @@ -37,7 +37,7 @@ typedef QGuiApplication Application; #endif #include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlContext> -#include <QtWebEngine/qtwebengineglobal.h> +#include <QtWebEngineQuick/qtwebengineglobal.h> int main(int argc, char **argv) { diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp index 5808fe167..cc83b675a 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 <QtWebEngine/qtwebengineglobal.h> +#include <QtWebEngineQuick/qtwebengineglobal.h> static QUrl startupUrl() { diff --git a/tests/manual/quick/touchbrowser/touchbrowser.pro b/tests/manual/quick/touchbrowser/touchbrowser.pro index 21e3d6f68..92e4e6703 100644 --- a/tests/manual/quick/touchbrowser/touchbrowser.pro +++ b/tests/manual/quick/touchbrowser/touchbrowser.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += quick webengine +QT += quick webenginequick CONFIG += c++11 SOURCES += \ |