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/itemmodels | |
| 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/itemmodels')
8 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index bf44cf5fa0..02b852bb3a 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -26,9 +26,9 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> -#include <QtCore/QCoreApplication> +#include <QTest> +#include <QtCore/QCoreApplication> #include <QtCore/QSortFilterProxyModel> #include <QtCore/QStringListModel> #include <QtGui/QStandardItemModel> @@ -37,6 +37,7 @@ // for testing QModelRoleDataSpan construction #include <QVarLengthArray> +#include <QSignalSpy> #include <array> #include <vector> #include <deque> diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp index 92700b251e..b6ee3c5d4a 100644 --- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qabstractproxymodel.h> #include <QItemSelection> #include <qstandarditemmodel.h> diff --git a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp index 8ceb621e42..3eb6c15ec2 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp +++ b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QCoreApplication> #include <QtSql/QtSql> #include <QtWidgets/QtWidgets> diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp index b9deb7b6a9..40495c1d9e 100644 --- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <QtCore/QCoreApplication> #include <qdebug.h> #include "modelstotest.cpp" diff --git a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index d58866cf7f..052abe0700 100644 --- a/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <QtGui/QtGui> diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp index ca97543ee7..0fabd5ea57 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp @@ -36,7 +36,10 @@ #include <QStringListModel> #include <QTableView> #include <QTreeView> -#include <QtTest> +#include <QTest> +#include <QStack> +#include <QSignalSpy> +#include <QAbstractItemModelTester> Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels") diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp index 7f2a4b64ae..adeb0cfe5a 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QStringListModel> #include "tst_qsortfilterproxymodel.h" diff --git a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp index fc65109bbc..79ad4145a2 100644 --- a/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <qabstractitemmodel.h> #include <qcoreapplication.h> #include <qmap.h> |