diff options
Diffstat (limited to 'examples/qtestlib/tutorial5')
-rw-r--r-- | examples/qtestlib/tutorial5/CMakeLists.txt | 33 | ||||
-rw-r--r-- | examples/qtestlib/tutorial5/benchmarking.cpp | 9 |
2 files changed, 21 insertions, 21 deletions
diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt index 47abcf5fc9..55bb4fb251 100644 --- a/examples/qtestlib/tutorial5/CMakeLists.txt +++ b/examples/qtestlib/tutorial5/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(tutorial5 LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtestlib/tutorial5") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets) +qt_standard_project_setup() + qt_add_executable(tutorial5 benchmarking.cpp ) @@ -23,15 +17,22 @@ set_target_properties(tutorial5 PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(tutorial5 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets +target_link_libraries(tutorial5 PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial5 - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET tutorial5 + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp index d22baa3cff..d88780757a 100644 --- a/examples/qtestlib/tutorial5/benchmarking.cpp +++ b/examples/qtestlib/tutorial5/benchmarking.cpp @@ -33,8 +33,8 @@ void TestBenchmark::simple() void TestBenchmark::multiple_data() { QTest::addColumn<bool>("useLocaleCompare"); - QTest::newRow("locale aware compare") << true; - QTest::newRow("standard compare") << false; + QTest::newRow("locale-aware-compare") << true; + QTest::newRow("standard-compare") << false; } //! [1] @@ -66,9 +66,8 @@ void TestBenchmark::series_data() QTest::addColumn<int>("stringSize"); for (int i = 1; i < 10000; i += 2000) { - QByteArray size = QByteArray::number(i); - QTest::newRow(("locale aware compare--" + size).constData()) << true << i; - QTest::newRow(("standard compare--" + size).constData()) << false << i; + QTest::addRow("locale-aware-compare:%d", i) << true << i; + QTest::addRow("standard-compare:%d", i) << false << i; } } //! [4] |