diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-03-23 14:52:23 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-03-28 23:07:37 +0200 |
| commit | b9f22db4c3d2584fd6ac03c56319fbf7b98af748 (patch) | |
| tree | de88bd4fef9c10ea70740a186bb541843569c766 /tests | |
| parent | 106292eef26d97d690d9c32700330230cc1402c1 (diff) | |
| download | qtwebengine-b9f22db4c3d2584fd6ac03c56319fbf7b98af748.tar.gz | |
Fix name colision for cmake target
After c89fcec the build with manual tests fails
as executables have same targets.
Fix too compilation issue.
Change-Id: I9fd2831b4f0d766e138ae2289e91aa43280568bd
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/quick/touchbrowser/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/manual/widgets/touchbrowser/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/manual/widgets/touchbrowser/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/quick/touchbrowser/CMakeLists.txt b/tests/manual/quick/touchbrowser/CMakeLists.txt index c3e9fd895..0d3275e58 100644 --- a/tests/manual/quick/touchbrowser/CMakeLists.txt +++ b/tests/manual/quick/touchbrowser/CMakeLists.txt @@ -13,7 +13,7 @@ set(TOUCHMOCKING_DIR "../../touchmocking") include_directories(${TOUCHMOCKING_DIR}) add_definitions(-DQUICK_TOUCHBROWSER) -qt_internal_add_manual_test(touchbrowser +qt_internal_add_manual_test(touchbrowser-quick GUI SOURCES main.cpp @@ -21,7 +21,7 @@ qt_internal_add_manual_test(touchbrowser ${TOUCHMOCKING_DIR}/touchmockingapplication.cpp ${TOUCHMOCKING_DIR}/touchmockingapplication.h ${TOUCHMOCKING_DIR}/utils.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Quick Qt::WebEngineQuick diff --git a/tests/manual/widgets/touchbrowser/CMakeLists.txt b/tests/manual/widgets/touchbrowser/CMakeLists.txt index 2ecad1193..d4fb544cc 100644 --- a/tests/manual/widgets/touchbrowser/CMakeLists.txt +++ b/tests/manual/widgets/touchbrowser/CMakeLists.txt @@ -13,7 +13,7 @@ set(TOUCHMOCKING_DIR "../../touchmocking") include_directories(${TOUCHMOCKING_DIR}) add_definitions(-DWIDGET_TOUCHBROWSER) -qt_internal_add_manual_test(touchbrowser +qt_internal_add_manual_test(touchbrowser-widget GUI SOURCES main.cpp @@ -21,7 +21,7 @@ qt_internal_add_manual_test(touchbrowser ${TOUCHMOCKING_DIR}/touchmockingapplication.cpp ${TOUCHMOCKING_DIR}/touchmockingapplication.h ${TOUCHMOCKING_DIR}/utils.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui Qt::WebEngineWidgets diff --git a/tests/manual/widgets/touchbrowser/main.cpp b/tests/manual/widgets/touchbrowser/main.cpp index 8c6b45279..18baf79e8 100644 --- a/tests/manual/widgets/touchbrowser/main.cpp +++ b/tests/manual/widgets/touchbrowser/main.cpp @@ -16,7 +16,7 @@ static QUrl startupUrl() QUrl ret; QStringList args(qApp->arguments()); args.takeFirst(); - for (const QString &arg : qAsConst(args)) { + for (const QString &arg : std::as_const(args)) { if (arg.startsWith(QLatin1Char('-'))) continue; ret = Utils::fromUserInput(arg); |