From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 20 Nov 2019 09:25:19 +0100 Subject: Post merge fixes Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor --- tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt | 1 - tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt | 1 - tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt | 2 -- 3 files changed, 4 deletions(-) (limited to 'tests/auto/concurrent') diff --git a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt index 5a4bd8cf35..62b0308851 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentfilter tst_qtconcurrentfilter.cpp DEFINES -QT_NO_LINKED_LIST - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt index 2e53c4cfc5..be51bf09bd 100644 --- a/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt @@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentmap tst_qtconcurrentmap.cpp DEFINES -QT_NO_LINKED_LIST - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) diff --git a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt index 99cc7f6ae0..27b376a406 100644 --- a/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt +++ b/tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt @@ -7,8 +7,6 @@ add_qt_test(tst_qtconcurrentmedian SOURCES tst_qtconcurrentmedian.cpp - DEFINES - QT_STRICT_ITERATORS PUBLIC_LIBRARIES Qt::Concurrent ) -- cgit v1.2.3