diff options
Diffstat (limited to 'tests/auto/cmake/test_concurrent_module')
-rw-r--r-- | tests/auto/cmake/test_concurrent_module/CMakeLists.txt | 18 | ||||
-rw-r--r-- | tests/auto/cmake/test_concurrent_module/main.cpp | 3 |
2 files changed, 5 insertions, 16 deletions
diff --git a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt index 7014fe51cd..621499808e 100644 --- a/tests/auto/cmake/test_concurrent_module/CMakeLists.txt +++ b/tests/auto/cmake/test_concurrent_module/CMakeLists.txt @@ -1,22 +1,10 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.14) project(test_concurrent_module) -find_package(Qt5Concurrent 5.0.0 REQUIRED) - -include_directories( - ${Qt5Concurrent_INCLUDE_DIRS} -) - -add_definitions( - ${Qt5Concurrent_DEFINITIONS} -) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") +find_package(Qt6Concurrent 6.0.0 REQUIRED) add_executable(mainapp main.cpp) -target_link_libraries(mainapp - ${Qt5Concurrent_LIBRARIES} -) +target_link_libraries(mainapp PRIVATE Qt::Concurrent) diff --git a/tests/auto/cmake/test_concurrent_module/main.cpp b/tests/auto/cmake/test_concurrent_module/main.cpp index 145738b8c3..1164b555f0 100644 --- a/tests/auto/cmake/test_concurrent_module/main.cpp +++ b/tests/auto/cmake/test_concurrent_module/main.cpp @@ -34,7 +34,8 @@ int main(int argc, char **argv) { QByteArray bytearray = "hello world"; - QtConcurrent::run(bytearray, &QByteArray::split, ','); + auto result = QtConcurrent::run(&QByteArray::split, bytearray, ','); + Q_UNUSED(result); return 0; } |