From 27d96b4789b98587e64642bf7bd6ef5f3a07e174 Mon Sep 17 00:00:00 2001
From: David Skoland <david.skoland@qt.io>
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 <volker.hilsheimer@qt.io>
---
 tests/auto/tools/moc/tst_moc.cpp                   | 3 ++-
 tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp | 4 +++-
 tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 3 ++-
 tests/auto/tools/qmake/tst_qmake.cpp               | 4 +++-
 tests/auto/tools/qmakelib/tst_qmakelib.h           | 2 +-
 tests/auto/tools/rcc/tst_rcc.cpp                   | 3 ++-
 tests/auto/tools/uic/tst_uic.cpp                   | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'tests/auto/tools')

diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 1f74c6cccd..3a0eed0a64 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
 #include <stdio.h>
 #include <qobject.h>
 #include <qmetaobject.h>
diff --git a/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp b/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
index a65c6fbe0b..90d91b9848 100644
--- a/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
+++ b/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
@@ -26,7 +26,9 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QLibraryInfo>
+#include <QProcess>
 
 #include "test1.h"
 
diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
index dd76aef923..12c2a9295f 100644
--- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
+++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QLibraryInfo>
 #include <QtCore/QProcess>
 #include <QtCore/QRegularExpression>
 
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 716f716495..2c0eaa06aa 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "testcompiler.h"
 
@@ -36,6 +36,8 @@
 #include <QRegularExpression>
 #include <QStandardPaths>
 #include <QTemporaryDir>
+#include <QLibraryInfo>
+#include <QProcessEnvironment>
 
 class tst_qmake : public QObject
 {
diff --git a/tests/auto/tools/qmakelib/tst_qmakelib.h b/tests/auto/tools/qmakelib/tst_qmakelib.h
index 4bc62cbd99..7c82a08cbd 100644
--- a/tests/auto/tools/qmakelib/tst_qmakelib.h
+++ b/tests/auto/tools/qmakelib/tst_qmakelib.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QProcessEnvironment>
-#include <QtTest/QtTest>
+#include <QTest>
 
 class tst_qmakelib : public QObject
 {
diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index 26d2862da7..108fd07b57 100644
--- a/tests/auto/tools/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
@@ -27,7 +27,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QLibraryInfo>
 #include <QtCore/QString>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QByteArray>
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index b9ab71736e..1dfc572d1d 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -29,7 +29,7 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QString>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/QProcess>
 #include <QtCore/QByteArray>
 #include <QtCore/QLibraryInfo>
-- 
cgit v1.2.3