summaryrefslogtreecommitdiffstats
path: root/examples/qtestlib
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qtestlib')
-rw-r--r--examples/qtestlib/CMakeLists.txt5
-rw-r--r--examples/qtestlib/tutorial1/CMakeLists.txt36
-rw-r--r--examples/qtestlib/tutorial2/CMakeLists.txt36
-rw-r--r--examples/qtestlib/tutorial2/testqstring.cpp4
-rw-r--r--examples/qtestlib/tutorial3/CMakeLists.txt36
-rw-r--r--examples/qtestlib/tutorial4/CMakeLists.txt36
-rw-r--r--examples/qtestlib/tutorial4/testgui.cpp2
-rw-r--r--examples/qtestlib/tutorial5/CMakeLists.txt36
-rw-r--r--examples/qtestlib/tutorial5/benchmarking.cpp9
9 files changed, 111 insertions, 89 deletions
diff --git a/examples/qtestlib/CMakeLists.txt b/examples/qtestlib/CMakeLists.txt
index e2b00670ed..6f139c87dc 100644
--- a/examples/qtestlib/CMakeLists.txt
+++ b/examples/qtestlib/CMakeLists.txt
@@ -1,4 +1,7 @@
-if(NOT TARGET Qt::Widgets)
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+if(NOT TARGET Qt6::Widgets)
return()
endif()
qt_internal_add_example(tutorial1)
diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt
index ff47a15970..b4fc090e94 100644
--- a/examples/qtestlib/tutorial1/CMakeLists.txt
+++ b/examples/qtestlib/tutorial1/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(tutorial1 LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtestlib/tutorial1")
-
find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets)
+qt_standard_project_setup()
+
qt_add_executable(tutorial1
testqstring.cpp
)
@@ -20,15 +17,22 @@ set_target_properties(tutorial1 PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(tutorial1 PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Test
- Qt::Widgets
+target_link_libraries(tutorial1 PRIVATE
+ Qt6::Core
+ Qt6::Gui
+ Qt6::Test
+ Qt6::Widgets
)
install(TARGETS tutorial1
- 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 tutorial1
+ OUTPUT_SCRIPT deploy_script
+ NO_UNSUPPORTED_PLATFORM_ERROR
)
+install(SCRIPT ${deploy_script})
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]
diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt
index f915a7f0df..be09e1d05b 100644
--- a/examples/qtestlib/tutorial3/CMakeLists.txt
+++ b/examples/qtestlib/tutorial3/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(tutorial3 LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtestlib/tutorial3")
-
find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets)
+qt_standard_project_setup()
+
qt_add_executable(tutorial3
testgui.cpp
)
@@ -20,15 +17,22 @@ set_target_properties(tutorial3 PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(tutorial3 PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Test
- Qt::Widgets
+target_link_libraries(tutorial3 PRIVATE
+ Qt6::Core
+ Qt6::Gui
+ Qt6::Test
+ Qt6::Widgets
)
install(TARGETS tutorial3
- 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 tutorial3
+ OUTPUT_SCRIPT deploy_script
+ NO_UNSUPPORTED_PLATFORM_ERROR
)
+install(SCRIPT ${deploy_script})
diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt
index 9686317405..6f13c7c2ba 100644
--- a/examples/qtestlib/tutorial4/CMakeLists.txt
+++ b/examples/qtestlib/tutorial4/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(tutorial4 LANGUAGES CXX)
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
- set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qtestlib/tutorial4")
-
find_package(Qt6 REQUIRED COMPONENTS Core Gui Test Widgets)
+qt_standard_project_setup()
+
qt_add_executable(tutorial4
testgui.cpp
)
@@ -20,15 +17,22 @@ set_target_properties(tutorial4 PROPERTIES
MACOSX_BUNDLE TRUE
)
-target_link_libraries(tutorial4 PUBLIC
- Qt::Core
- Qt::Gui
- Qt::Test
- Qt::Widgets
+target_link_libraries(tutorial4 PRIVATE
+ Qt6::Core
+ Qt6::Gui
+ Qt6::Test
+ Qt6::Widgets
)
install(TARGETS tutorial4
- 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 tutorial4
+ OUTPUT_SCRIPT deploy_script
+ NO_UNSUPPORTED_PLATFORM_ERROR
)
+install(SCRIPT ${deploy_script})
diff --git a/examples/qtestlib/tutorial4/testgui.cpp b/examples/qtestlib/tutorial4/testgui.cpp
index 58f895cef5..527532edee 100644
--- a/examples/qtestlib/tutorial4/testgui.cpp
+++ b/examples/qtestlib/tutorial4/testgui.cpp
@@ -28,7 +28,7 @@ void TestGui::testGui_data()
QTestEventList list2;
list2.addKeyClick('a');
list2.addKeyClick(Qt::Key_Backspace);
- QTest::newRow("there and back again") << list2 << "";
+ QTest::newRow("there+back-again") << list2 << "";
}
//! [1]
diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt
index 479cdc45d6..55bb4fb251 100644
--- a/examples/qtestlib/tutorial5/CMakeLists.txt
+++ b/examples/qtestlib/tutorial5/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(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
)
@@ -20,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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:35:50 +0000