diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-09 14:59:40 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-12-10 11:52:30 +0100 |
| commit | 2304acab5ff3bd3832c2e388cfdab27f2a95caa8 (patch) | |
| tree | 836fda9d762ec9c4f8461804f1e2d22cdf16303f /tests/auto/concurrent | |
| parent | b94b7687b0635ee74a3ccd83a234ead0600fd47f (diff) | |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/concurrent')
| -rw-r--r-- | tests/auto/concurrent/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 3 deletions
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 ) |