summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-09-04 12:43:22 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-09-12 15:11:52 +0200
commit55687924e3cc40b1ffc5a9038bb7e37d1ed6a19c (patch)
tree1fd6ff93fefee5b64c03d4fdda97fb000b12bfb0 /tests/auto/corelib
parent1618727da41a2806d481854d3b80e503e4f18546 (diff)
cmake: Re-enable qcoreapplication and qtimer tests
They were disabled in ad0e3e26fabe0574889c5cf3a26a145a7f5d9c98, but that was probably accidental. Change-Id: Ia9cbccfbeecfe84768c3465f5699ed44b7f932a5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/kernel/CMakeLists.txt4
-rw-r--r--tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt29
-rw-r--r--tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt45
-rw-r--r--tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt19
4 files changed, 95 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt
index e1b2db64c0..154cc8e766 100644
--- a/tests/auto/corelib/kernel/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from kernel.pro.
-# add_subdirectory(qcoreapplication) # special case
+add_subdirectory(qcoreapplication)
add_subdirectory(qdeadlinetimer)
add_subdirectory(qelapsedtimer)
add_subdirectory(qeventdispatcher)
@@ -15,7 +15,7 @@ add_subdirectory(qmetaenum)
add_subdirectory(qpointer)
add_subdirectory(qsignalblocker)
add_subdirectory(qsignalmapper)
-# add_subdirectory(qtimer) # special case
+add_subdirectory(qtimer)
add_subdirectory(qtranslator)
add_subdirectory(qvariant)
if(TARGET Qt::Network)
diff --git a/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..08d1338d02
--- /dev/null
+++ b/tests/auto/corelib/kernel/qcoreapplication/.prev_CMakeLists.txt
@@ -0,0 +1,29 @@
+# Generated from qcoreapplication.pro.
+
+if(NOT QT_FEATURE_private_tests)
+ return()
+endif()
+
+#####################################################################
+## tst_qcoreapplication Test:
+#####################################################################
+
+qt_add_test(tst_qcoreapplication
+ SOURCES
+ tst_qcoreapplication.cpp tst_qcoreapplication.h
+ PUBLIC_LIBRARIES
+ Qt::CorePrivate
+)
+
+#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
+# QMAKE_INFO_PLIST = "$$PWD/Info.plist"
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qcoreapplication.pro:WIN32:
+# VERSION = "1.2.3.4"
+
+#### Keys ignored in scope 3:.:.:qcoreapplication.pro:else:
+# VERSION = "1.2.3"
diff --git a/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
new file mode 100644
index 0000000000..e552860688
--- /dev/null
+++ b/tests/auto/corelib/kernel/qcoreapplication/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Generated from qcoreapplication.pro.
+
+if(NOT QT_FEATURE_private_tests)
+ return()
+endif()
+
+#####################################################################
+## tst_qcoreapplication Test:
+#####################################################################
+
+# special case begin
+if (WIN32)
+ set(target_version "1.2.3.4")
+else()
+ set(target_version "1.2.3")
+endif()
+# special case end
+
+qt_add_test(tst_qcoreapplication
+ VERSION ${target_version} # special case
+ SOURCES
+ tst_qcoreapplication.cpp tst_qcoreapplication.h
+ PUBLIC_LIBRARIES
+ Qt::CorePrivate
+)
+
+# special case begin
+if (APPLE)
+ set_property(TARGET tst_qcoreapplication PROPERTY MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist")
+ set_property(TARGET tst_qcoreapplication PROPERTY PROPERTY MACOSX_BUNDLE TRUE)
+endif()
+# special case end
+
+#### Keys ignored in scope 1:.:.:qcoreapplication.pro:<TRUE>:
+# QMAKE_INFO_PLIST = "$$PWD/Info.plist"
+# _REQUIREMENTS = "qtConfig(private_tests)"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qcoreapplication.pro:WIN32:
+# VERSION = "1.2.3.4"
+
+#### Keys ignored in scope 3:.:.:qcoreapplication.pro:else:
+# VERSION = "1.2.3"
diff --git a/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ea894ff3d3
--- /dev/null
+++ b/tests/auto/corelib/kernel/qobject/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qobject.pro.
+
+#####################################################################
+## tst_qobject Test:
+#####################################################################
+
+qt_add_test(tst_qobject
+ SOURCES
+ tst_qobject.cpp
+ DEFINES
+ QT_DISABLE_DEPRECATED_BEFORE=0
+ PUBLIC_LIBRARIES
+ Qt::CorePrivate
+ Qt::Network
+)
+
+## Scopes:
+#####################################################################
+add_subdirectory(signalbug)