aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2021-04-23 10:31:21 +0200
committerMitch Curtis <mitch.curtis@qt.io>2021-04-26 11:12:46 +0200
commitc4d48e3b8aeb57154b674f5a53ba08678ad9983c (patch)
treec30f4880cee3a5e147c1c40bca61442a50eb3e2e /tests/manual
parentb43b6ff94e98bf9afd19c20fba7ddb90ce47cedb (diff)
Fix up build system files for manual tests
- Add missing tests to qmake/CMake "sub-dir" projects - Make each manual test a standalone project so that it can be opened in Creator Task-number: QTBUG-93020 Change-Id: I534192852fb8ffdf85398479fb0da2a29d04330a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/CMakeLists.txt4
-rw-r--r--tests/manual/buttons/CMakeLists.txt6
-rw-r--r--tests/manual/fonts/CMakeLists.txt6
-rw-r--r--tests/manual/gifs/CMakeLists.txt6
-rw-r--r--tests/manual/headerview/CMakeLists.txt6
-rw-r--r--tests/manual/manual.pro8
-rw-r--r--tests/manual/qquickdialog/CMakeLists.txt6
-rw-r--r--tests/manual/screenshots/CMakeLists.txt6
-rw-r--r--tests/manual/styles-cover-flow/CMakeLists.txt6
-rw-r--r--tests/manual/styles/CMakeLists.txt6
-rw-r--r--tests/manual/systemtrayicon/CMakeLists.txt6
-rw-r--r--tests/manual/testbench/CMakeLists.txt6
-rw-r--r--tests/manual/viewinqwidget/CMakeLists.txt6
13 files changed, 75 insertions, 3 deletions
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 92ecd4be..ca545da7 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -1,12 +1,14 @@
# Generated from manual.pro.
add_subdirectory(buttons)
-add_subdirectory(gifs)
+add_subdirectory(dialogs)
add_subdirectory(fonts)
+add_subdirectory(gifs)
add_subdirectory(headerview)
add_subdirectory(qquickdialog)
add_subdirectory(screenshots)
add_subdirectory(styles)
+add_subdirectory(styles-cover-flow)
add_subdirectory(testbench)
if(QT_FEATURE_systemtrayicon)
add_subdirectory(systemtrayicon)
diff --git a/tests/manual/buttons/CMakeLists.txt b/tests/manual/buttons/CMakeLists.txt
index e57611a5..57f80c88 100644
--- a/tests/manual/buttons/CMakeLists.txt
+++ b/tests/manual/buttons/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from buttons.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(buttons LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## buttons Binary:
#####################################################################
diff --git a/tests/manual/fonts/CMakeLists.txt b/tests/manual/fonts/CMakeLists.txt
index b0670fe2..6160ff11 100644
--- a/tests/manual/fonts/CMakeLists.txt
+++ b/tests/manual/fonts/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from fonts.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(fonts LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## fonts Binary:
#####################################################################
diff --git a/tests/manual/gifs/CMakeLists.txt b/tests/manual/gifs/CMakeLists.txt
index 8bbec940..a2fc5355 100644
--- a/tests/manual/gifs/CMakeLists.txt
+++ b/tests/manual/gifs/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from gifs.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(tst_gifs LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## tst_gifs Test:
#####################################################################
diff --git a/tests/manual/headerview/CMakeLists.txt b/tests/manual/headerview/CMakeLists.txt
index 035082d1..4c4ae94a 100644
--- a/tests/manual/headerview/CMakeLists.txt
+++ b/tests/manual/headerview/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from headerview.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(headerview LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## headerview Binary:
#####################################################################
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 8107cfc5..27ec27f1 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -1,13 +1,17 @@
TEMPLATE = subdirs
SUBDIRS += \
buttons \
- gifs \
+ dialogs \
fonts \
+ gifs \
headerview \
qquickdialog \
screenshots \
styles \
- testbench
+ styles-cover-flow \
+ systemtrayicon \
+ testbench \
+ viewinqwidget
qtConfig(systemtrayicon): SUBDIRS += systemtrayicon
diff --git a/tests/manual/qquickdialog/CMakeLists.txt b/tests/manual/qquickdialog/CMakeLists.txt
index 10d14d53..661a7dc7 100644
--- a/tests/manual/qquickdialog/CMakeLists.txt
+++ b/tests/manual/qquickdialog/CMakeLists.txt
@@ -1,3 +1,9 @@
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(qquickdialog LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
qt_internal_add_manual_test(qquickdialog
GUI
SOURCES
diff --git a/tests/manual/screenshots/CMakeLists.txt b/tests/manual/screenshots/CMakeLists.txt
index c01418ef..b6bd2926 100644
--- a/tests/manual/screenshots/CMakeLists.txt
+++ b/tests/manual/screenshots/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from screenshots.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(screenshots LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## screenshots Binary:
#####################################################################
diff --git a/tests/manual/styles-cover-flow/CMakeLists.txt b/tests/manual/styles-cover-flow/CMakeLists.txt
index 4c9fd13b..ab62046c 100644
--- a/tests/manual/styles-cover-flow/CMakeLists.txt
+++ b/tests/manual/styles-cover-flow/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from styles-cover-flow.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(styles-cover-flow LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## stylescoverflow Binary:
#####################################################################
diff --git a/tests/manual/styles/CMakeLists.txt b/tests/manual/styles/CMakeLists.txt
index b900da1b..7ba6c733 100644
--- a/tests/manual/styles/CMakeLists.txt
+++ b/tests/manual/styles/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from styles.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(styles LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## styles Binary:
#####################################################################
diff --git a/tests/manual/systemtrayicon/CMakeLists.txt b/tests/manual/systemtrayicon/CMakeLists.txt
index 667fc7f7..b44a4496 100644
--- a/tests/manual/systemtrayicon/CMakeLists.txt
+++ b/tests/manual/systemtrayicon/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from systemtrayicon.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(systemtrayicon LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## systemtrayicon Binary:
#####################################################################
diff --git a/tests/manual/testbench/CMakeLists.txt b/tests/manual/testbench/CMakeLists.txt
index 2fe24d60..66933a92 100644
--- a/tests/manual/testbench/CMakeLists.txt
+++ b/tests/manual/testbench/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from testbench.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(testbench LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## testbench Binary:
#####################################################################
diff --git a/tests/manual/viewinqwidget/CMakeLists.txt b/tests/manual/viewinqwidget/CMakeLists.txt
index 9a5021fa..f91b0d8c 100644
--- a/tests/manual/viewinqwidget/CMakeLists.txt
+++ b/tests/manual/viewinqwidget/CMakeLists.txt
@@ -1,5 +1,11 @@
# Generated from viewinqwidget.pro.
+if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+ cmake_minimum_required(VERSION 3.16)
+ project(viewinqwidget LANGUAGES C CXX ASM)
+ find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
+endif()
+
#####################################################################
## viewinqwidget Binary:
#####################################################################