summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-07-07 17:40:40 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-07-09 09:38:31 +0200
commit5417f1e40cb647c05bffad21493feacac45f193e (patch)
tree521bbfcbd5b4c4a443cba636cee9eab148292318 /tests/auto/corelib
parent74cb331af3cfe723ae16cd1b00c9dd9291b4e7e9 (diff)
CMake: Regenerate tests
This is in preparation for regenerating them with the new qt_foo prefixed APIs. Change-Id: Iff34932d642b1c0186ee39f952adf3ad367fd602 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/io/qurlinternal/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt7
-rw-r--r--tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt12
-rw-r--r--tests/auto/corelib/thread/qpromise/CMakeLists.txt6
-rw-r--r--tests/auto/corelib/tools/qlist/CMakeLists.txt4
5 files changed, 19 insertions, 12 deletions
diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
index 16d353434a..3225f7d308 100644
--- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
+++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
add_qt_test(tst_qurlinternal
SOURCES
- utf8data.cpp
tst_qurlinternal.cpp
+ utf8data.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
)
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
index cb847dc503..bb9429cdb5 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qsocketnotifier/CMakeLists.txt
@@ -29,10 +29,3 @@ extend_target(tst_qsocketnotifier CONDITION WIN32
PUBLIC_LIBRARIES
ws2_32
)
-
-extend_target(tst_qsocketnotifier CONDITION QT_FEATURE_reduce_exports AND UNIX
- SOURCES
- ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qabstractsocketengine_p.h
- ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine.cpp ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_p.h
- ${QT_SOURCE_TREE}/src/network/socket/qnativesocketengine_unix.cpp
-)
diff --git a/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..dc25a38fea
--- /dev/null
+++ b/tests/auto/corelib/thread/qpromise/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from qpromise.pro.
+
+#####################################################################
+## tst_qpromise Test:
+#####################################################################
+
+qt_add_test(tst_qpromise
+ SOURCES
+ tst_qpromise.cpp
+ PUBLIC_LIBRARIES
+ Qt::CorePrivate
+)
diff --git a/tests/auto/corelib/thread/qpromise/CMakeLists.txt b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
index 3cc20cafd7..c591092257 100644
--- a/tests/auto/corelib/thread/qpromise/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qpromise/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Generated from qpromise.pro.
+
#####################################################################
## tst_qpromise Test:
#####################################################################
@@ -7,6 +9,6 @@ qt_add_test(tst_qpromise
tst_qpromise.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
- LIBRARIES
- Threads::Threads # solves issue with libpthread linkage
+ LIBRARIES # special case
+ Threads::Threads # solves issue with libpthread linkage # special case
)
diff --git a/tests/auto/corelib/tools/qlist/CMakeLists.txt b/tests/auto/corelib/tools/qlist/CMakeLists.txt
index fd771de03a..6909d83967 100644
--- a/tests/auto/corelib/tools/qlist/CMakeLists.txt
+++ b/tests/auto/corelib/tools/qlist/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from qvector.pro.
+# Generated from qlist.pro.
#####################################################################
-## tst_qvector Test:
+## tst_qlist Test:
#####################################################################
qt_add_test(tst_qlist