From 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 9 Dec 2020 14:59:40 +0100 Subject: CMake: Regenerate projects using pro2cmake one last time And fix up some wrong qmake project files Pick-to: 6.0 Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443 Reviewed-by: Qt CI Bot Reviewed-by: Joerg Bornemann --- tests/auto/concurrent/CMakeLists.txt | 2 +- tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/auto/concurrent') diff --git a/tests/auto/concurrent/CMakeLists.txt b/tests/auto/concurrent/CMakeLists.txt index ec8eea76aa..dce6effa55 100644 --- a/tests/auto/concurrent/CMakeLists.txt +++ b/tests/auto/concurrent/CMakeLists.txt @@ -1,8 +1,8 @@ # Generated from concurrent.pro. add_subdirectory(qtconcurrentfilter) -add_subdirectory(qtconcurrentfiltermapgenerated) add_subdirectory(qtconcurrentiteratekernel) +add_subdirectory(qtconcurrentfiltermapgenerated) add_subdirectory(qtconcurrentmap) add_subdirectory(qtconcurrentmedian) add_subdirectory(qtconcurrentrun) diff --git a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt index c2a11627ca..1933365e86 100644 --- a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt @@ -1,12 +1,13 @@ +# Generated from qtconcurrentfiltermapgenerated.pro. + ##################################################################### ## tst_qtconcurrentfiltermapgenerated Test: ##################################################################### qt_internal_add_test(tst_qtconcurrentfiltermapgenerated SOURCES - tst_qtconcurrentfiltermapgenerated.cpp - tst_qtconcurrentfiltermapgenerated.h tst_qtconcurrent_selected_tests.cpp + tst_qtconcurrentfiltermapgenerated.cpp tst_qtconcurrentfiltermapgenerated.h PUBLIC_LIBRARIES Qt::Concurrent ) -- cgit v1.2.3