diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-09 11:59:29 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-09 13:04:03 +0200 |
| commit | 2104dcd828d7c3da23300014fdddbc63f9c23cb3 (patch) | |
| tree | 19a197b5c6e40a795a052bb86896da837467509e /tests | |
| parent | 135327c494b00bbc9d0c4deffba92d55c08ea93f (diff) | |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Ic36741d2bcaec8d5e5dc96638b7122f8ce51bdb2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qquickheaderview/tst_qquickheaderview.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qquickheaderview/tst_qquickheaderview.cpp b/tests/auto/qquickheaderview/tst_qquickheaderview.cpp index 611e39cb..d8d71183 100644 --- a/tests/auto/qquickheaderview/tst_qquickheaderview.cpp +++ b/tests/auto/qquickheaderview/tst_qquickheaderview.cpp @@ -203,7 +203,7 @@ public: } private: - QVector<QVariant> hData, vData; + QList<QVariant> hData, vData; }; class tst_QQuickHeaderView : public QQmlDataTest { diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp index 0ecc95c5..7a1cb259 100644 --- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp +++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtCore/qvector.h> +#include <QtCore/qlist.h> #include <qtest.h> @@ -64,13 +64,13 @@ tst_qquickiconlabel::tst_qquickiconlabel() void tst_qquickiconlabel::display_data() { - QTest::addColumn<QVector<QQuickIconLabel::Display> >("displayTypes"); + QTest::addColumn<QList<QQuickIconLabel::Display> >("displayTypes"); QTest::addColumn<bool>("mirrored"); QTest::addColumn<qreal>("labelWidth"); QTest::addColumn<qreal>("labelHeight"); QTest::addColumn<qreal>("spacing"); - typedef QVector<QQuickIconLabel::Display> DisplayVector; + typedef QList<QQuickIconLabel::Display> DisplayVector; QQuickIconLabel::Display IconOnly = QQuickIconLabel::IconOnly; QQuickIconLabel::Display TextOnly = QQuickIconLabel::TextOnly; QQuickIconLabel::Display TextUnderIcon = QQuickIconLabel::TextUnderIcon; @@ -108,7 +108,7 @@ void tst_qquickiconlabel::display_data() void tst_qquickiconlabel::display() { - QFETCH(QVector<QQuickIconLabel::Display>, displayTypes); + QFETCH(QList<QQuickIconLabel::Display>, displayTypes); QFETCH(bool, mirrored); QFETCH(qreal, labelWidth); QFETCH(qreal, labelHeight); |