diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 13:13:05 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-07 11:48:45 +0200 |
| commit | 77bb50de8f3f7defe1329e6c4a6e066d510afc55 (patch) | |
| tree | 758b5aab51211aaba887e3ffe9bb4d46f9e740cf /src/testlib | |
| parent | 989fca660c3556fa957ed9a3f7cd3b948a4166a2 (diff) | |
Use QList instead of QVector in qtbase
Fixes all other QVector occurrences
Task-number: QTBUG-84469
Change-Id: I5f9311298d341a9a3061a6a640539583d1618939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qsignalspy.h | 3 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 18 | ||||
| -rw-r--r-- | src/testlib/qtestlog.cpp | 6 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index a91e3032c8..b514a71a2c 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -44,9 +44,8 @@ #include <QtCore/qlist.h> #include <QtCore/qobject.h> #include <QtCore/qmetaobject.h> -#include <QtCore/qvariant.h> -#include <QtCore/qvector.h> #include <QtTest/qtesteventloop.h> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 002709a736..dffbfbe9a3 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -42,23 +42,23 @@ #include <QtTest/qtestassert.h> #include <QtCore/qbytearray.h> -#include <QtCore/qmetaobject.h> -#include <QtCore/qobject.h> -#include <QtCore/qstringlist.h> -#include <QtCore/qvector.h> -#include <QtCore/qvarlengtharray.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> #include <QtCore/qfile.h> #include <QtCore/qfileinfo.h> -#include <QtCore/qdir.h> -#include <QtCore/qdebug.h> #include <QtCore/qfloat16.h> #include <QtCore/qlibraryinfo.h> -#include <QtCore/private/qtools_p.h> -#include <QtCore/qdiriterator.h> +#include <QtCore/qlist.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> #include <QtCore/qtemporarydir.h> #include <QtCore/qthread.h> +#include <QtCore/qvarlengtharray.h> #include <QtCore/private/qlocking_p.h> +#include <QtCore/private/qtools_p.h> #include <QtCore/private/qwaitcondition_p.h> #include <QtCore/qtestsupport_core.h> diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 51dbc89963..3341c235e6 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -58,9 +58,9 @@ #include <QtCore/qatomic.h> #include <QtCore/qbytearray.h> -#include <QtCore/QElapsedTimer> -#include <QtCore/QVariant> -#include <QtCore/qvector.h> +#include <QtCore/qelapsedtimer.h> +#include <QtCore/qlist.h> +#include <QtCore/qvariant.h> #if QT_CONFIG(regularexpression) #include <QtCore/QRegularExpression> #endif |