diff options
Diffstat (limited to 'tests/auto/concurrent')
4 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt index e4e6884728..df8d278ee0 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfilter/CMakeLists.txt @@ -5,10 +5,12 @@ ##################################################################### add_qt_test(tst_qtconcurrentfilter + GUI SOURCES tst_qtconcurrentfilter.cpp DEFINES + # -QT_NO_LINKED_LIST # special case remove until figured out how to deal with this QT_STRICT_ITERATORS - LIBRARIES + PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro index f3684faa61..15345d40db 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro @@ -3,3 +3,4 @@ TARGET = tst_qtconcurrentfilter QT = core testlib concurrent SOURCES = tst_qtconcurrentfilter.cpp DEFINES += QT_STRICT_ITERATORS +DEFINES -= QT_NO_LINKED_LIST diff --git a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt index 2158aa7d75..1dce177058 100644 --- a/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmap/CMakeLists.txt @@ -5,16 +5,15 @@ ##################################################################### add_qt_test(tst_qtconcurrentmap + GUI SOURCES tst_qtconcurrentmap.cpp DEFINES + # -QT_NO_LINKED_LIST # special case remove until we figure this out QT_STRICT_ITERATORS - LIBRARIES + PUBLIC_LIBRARIES Qt::Concurrent ) ## Scopes: ##################################################################### -# -#extend_target(tst_qtconcurrentmap CONDITION contains(QT_CONFIG, c++1z) -#) diff --git a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro index fd8fd0a74a..717d103e44 100644 --- a/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -3,6 +3,7 @@ TARGET = tst_qtconcurrentmap QT = core testlib concurrent SOURCES = tst_qtconcurrentmap.cpp DEFINES += QT_STRICT_ITERATORS +DEFINES -= QT_NO_LINKED_LIST # Force C++17 if available contains(QT_CONFIG, c++1z): CONFIG += c++1z |