From 27d96b4789b98587e64642bf7bd6ef5f3a07e174 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 26 Nov 2020 17:31:50 +0100 Subject: Replace QtTest headers with QTest Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer --- tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 2 +- .../tst_qtconcurrentfiltermapgenerated.cpp | 2 +- .../tst_qtconcurrentfiltermapgenerated.h | 2 +- .../qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp | 2 +- tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 6 +++--- tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp | 2 +- tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp | 4 +++- tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp | 5 ++++- .../qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) (limited to 'tests/auto/concurrent') diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index a0114d57b2..6c27884977 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "../testhelper_functions.h" diff --git a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp index 4eb7a1a9d2..5983d6cf76 100644 --- a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp +++ b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "../testhelper_functions.h" #include "generation_helpers.h" diff --git a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h index e6229236a3..1b49a523f8 100644 --- a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h +++ b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h @@ -27,7 +27,7 @@ ****************************************************************************/ #include #include -#include +#include #include "generation_helpers.h" diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp index 574c82b78e..7fba6ed580 100644 --- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp +++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp @@ -67,7 +67,7 @@ int distance(TestIterator &a, TestIterator &b) } #include -#include +#include using namespace QtConcurrent; diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index dca3fce370..67e979dc14 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -27,12 +27,12 @@ ****************************************************************************/ #include #include - #include + #include #include - -#include +#include +#include #include "../testhelper_functions.h" diff --git a/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp b/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp index 22e555d2db..8a797447bb 100644 --- a/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp +++ b/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include -#include +#include class tst_QtConcurrentMedian: public QObject { diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp index c4d7c1d362..1b0b9577cf 100644 --- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -31,7 +31,9 @@ #include #include #include -#include +#include +#include +#include using namespace QtConcurrent; diff --git a/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp b/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp index 3ad34c3369..a95f424d0b 100644 --- a/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp +++ b/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp @@ -28,7 +28,10 @@ #include -#include +#include +#include + +#include class tst_QtConcurrentTask : public QObject { diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp index f5ddf4560e..e58eb68cea 100644 --- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp +++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include using namespace QtConcurrent; -- cgit v1.2.3