summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2019-11-14 17:27:43 +0100
committerLars Knoll <lars.knoll@qt.io>2020-03-05 16:08:30 +0100
commitd1882c79f2e2366a2a77e64ef9d7a5a918a776a8 (patch)
treeca3e76a645cbc1f1ca2fbbd92f1cf046ab13abd8 /tests
parent4f7cc722985fb52ea67f56dfb766bb274410ba2d (diff)
Get rid of some QT_STRICT_ITERATORS leftover
Amends 06456873fceddcd340431fc5999c50ff6d3c2371. Fixes: QTBUG-82611 Change-Id: I8b1e01549f3e910b85a571833237e38a7c2b49a9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt2
-rw-r--r--tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt5
-rw-r--r--tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt5
-rw-r--r--tests/auto/corelib/thread/qfuture/CMakeLists.txt7
4 files changed, 5 insertions, 14 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
index 62b0308851..be8c936c48 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
@@ -7,8 +7,6 @@
add_qt_test(tst_qtconcurrentfilter
SOURCES
tst_qtconcurrentfilter.cpp
- DEFINES
- -QT_NO_LINKED_LIST
PUBLIC_LIBRARIES
Qt::Concurrent
)
diff --git a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt
index 9da443a3f9..7868906178 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt
@@ -4,12 +4,9 @@
## tst_qtconcurrentfilter Test:
#####################################################################
-add_qt_test(tst_qtconcurrentfilter
+qt_add_test(tst_qtconcurrentfilter
SOURCES
tst_qtconcurrentfilter.cpp
- DEFINES
- # -QT_NO_LINKED_LIST # special case remove until figured out how to deal with this
- QT_STRICT_ITERATORS
PUBLIC_LIBRARIES
Qt::Concurrent
)
diff --git a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt
index 8ae79db0cf..c14780e0de 100644
--- a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt
+++ b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt
@@ -4,12 +4,9 @@
## tst_qtconcurrentmap Test:
#####################################################################
-add_qt_test(tst_qtconcurrentmap
+qt_add_test(tst_qtconcurrentmap
SOURCES
tst_qtconcurrentmap.cpp
- DEFINES
- # -QT_NO_LINKED_LIST # special case remove until we figure this out
- QT_STRICT_ITERATORS
PUBLIC_LIBRARIES
Qt::Concurrent
)
diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
index db1afabc0d..6fdfc977e9 100644
--- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt
@@ -4,12 +4,11 @@
## tst_qfuture Test:
#####################################################################
-add_qt_test(tst_qfuture
+qt_add_test(tst_qfuture
SOURCES
tst_qfuture.cpp
- DEFINES
- # -QT_NO_JAVA_STYLE_ITERATORS # special case
- QT_STRICT_ITERATORS
+# DEFINES
+# -QT_NO_JAVA_STYLE_ITERATORS
PUBLIC_LIBRARIES
Qt::CorePrivate
)