diff options
author | David Skoland <david.skoland@qt.io> | 2020-11-26 17:31:50 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-12-22 15:20:30 +0100 |
commit | 27d96b4789b98587e64642bf7bd6ef5f3a07e174 (patch) | |
tree | 24db364d54a9b64a959b14bc5cc2bd3c64d5ccc7 /tests/auto/corelib/tools/qsharedpointer | |
parent | bbebfa0be2e51b638459d6d812e4db25a65a0d6d (diff) |
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>
Diffstat (limited to 'tests/auto/corelib/tools/qsharedpointer')
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index 11487d4b3e..37a24b6b9b 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp @@ -343,7 +343,7 @@ namespace QTest { if (qtModules & QExternalTest::QtScript) sourceCode += "#include <QtScript/QtScript>\n"; if (qtModules & QExternalTest::QtTest) - sourceCode += "#include <QtTest/QtTest>\n"; + sourceCode += "#include <QTest>\n"; if (qtModules & QExternalTest::QtDBus) sourceCode += "#include <QtDBus/QtDBus>\n"; if (qtModules & QExternalTest::QtWebKit) diff --git a/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp b/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp index e0780f8a9a..fa52c4f6c5 100644 --- a/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/nontracked.cpp @@ -40,7 +40,7 @@ */ #include <qsharedpointer.h> -#include <QtTest> +#include <QTest> #include "nontracked.h" diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp index 06c4091232..985564731d 100644 --- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp @@ -30,7 +30,9 @@ #define QT_SHAREDPOINTER_TRACK_POINTERS #include "qsharedpointer.h" -#include <QtTest/QtTest> +#include <QTest> +#include <QPointer> +#include <QRandomGenerator> #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QMap> |