diff options
Diffstat (limited to 'examples/qtestlib/tutorial2')
-rw-r--r-- | examples/qtestlib/tutorial2/CMakeLists.txt | 36 | ||||
-rw-r--r-- | examples/qtestlib/tutorial2/testqstring.cpp | 4 |
2 files changed, 22 insertions, 18 deletions
diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt index 791be7df06..ff4862e3c4 100644 --- a/examples/qtestlib/tutorial2/CMakeLists.txt +++ b/examples/qtestlib/tutorial2/CMakeLists.txt @@ -1,16 +1,13 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(tutorial2 LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtestlib/tutorial2") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets) +qt_standard_project_setup() + qt_add_executable(tutorial2 testqstring.cpp ) @@ -20,15 +17,22 @@ set_target_properties(tutorial2 PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(tutorial2 PUBLIC - Qt::Core - Qt::Gui - Qt::Test - Qt::Widgets +target_link_libraries(tutorial2 PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Test + Qt6::Widgets ) install(TARGETS tutorial2 - 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 tutorial2 + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/qtestlib/tutorial2/testqstring.cpp b/examples/qtestlib/tutorial2/testqstring.cpp index 2e87292daa..fa6779a16f 100644 --- a/examples/qtestlib/tutorial2/testqstring.cpp +++ b/examples/qtestlib/tutorial2/testqstring.cpp @@ -20,9 +20,9 @@ void TestQString::toUpper_data() QTest::addColumn<QString>("string"); QTest::addColumn<QString>("result"); - QTest::newRow("all lower") << "hello" << "HELLO"; + QTest::newRow("all-lower") << "hello" << "HELLO"; QTest::newRow("mixed") << "Hello" << "HELLO"; - QTest::newRow("all upper") << "HELLO" << "HELLO"; + QTest::newRow("all-upper") << "HELLO" << "HELLO"; } //! [1] |