diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-27 10:34:00 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-27 13:08:10 +0000 |
commit | a60db17242d70c05cf775a5e164d76e339a3d207 (patch) | |
tree | a97758ded66b8f917b2456041cbc64a22207c9e1 /tests/auto/language/tst_language.cpp | |
parent | 63dae4fee847cf8ce71a71adaa15a3a2c93ea7e8 (diff) | |
download | qbs-a60db17242d70c05cf775a5e164d76e339a3d207.tar.gz |
Fix size_t/int size mismatch warning
Change-Id: I4e15b8ebfb626c5f1477a527f09e6362cd9a6c2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/language/tst_language.cpp')
-rw-r--r-- | tests/auto/language/tst_language.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index 24a3ae8cb..ec2580732 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -1038,31 +1038,31 @@ void TestLanguage::getNativeSetting() void TestLanguage::groupConditions_data() { QTest::addColumn<size_t>("groupCount"); - QTest::addColumn<QList<bool> >("groupEnabled"); - QTest::newRow("init") << size_t(0) << QList<bool>(); + QTest::addColumn<std::vector<bool>>("groupEnabled"); + QTest::newRow("init") << size_t(0) << std::vector<bool>(); QTest::newRow("no_condition_no_group") - << size_t(1) << (QList<bool>() << true); + << size_t(1) << std::vector<bool>{ true }; QTest::newRow("no_condition") - << size_t(2) << (QList<bool>() << true << true); + << size_t(2) << std::vector<bool>{ true, true }; QTest::newRow("true_condition") - << size_t(2) << (QList<bool>() << true << true); + << size_t(2) << std::vector<bool>{ true, true }; QTest::newRow("false_condition") - << size_t(2) << (QList<bool>() << true << false); + << size_t(2) << std::vector<bool>{ true, false }; QTest::newRow("true_condition_from_product") - << size_t(2) << (QList<bool>() << true << true); + << size_t(2) << std::vector<bool>{ true, true }; QTest::newRow("true_condition_from_project") - << size_t(2) << (QList<bool>() << true << true); + << size_t(2) << std::vector<bool>{ true, true }; QTest::newRow("condition_accessing_module_property") - << size_t(2) << (QList<bool>() << true << false); - QTest::newRow("cleanup") << size_t(0) << QList<bool>(); + << size_t(2) << std::vector<bool>{ true, false }; + QTest::newRow("cleanup") << size_t(0) << std::vector<bool>(); } void TestLanguage::groupConditions() { HANDLE_INIT_CLEANUP_DATATAGS("groupconditions.qbs"); QFETCH(size_t, groupCount); - QFETCH(QList<bool>, groupEnabled); - QCOMPARE(groupCount, size_t(groupEnabled.size())); + QFETCH(std::vector<bool>, groupEnabled); + QCOMPARE(groupCount, groupEnabled.size()); const QHash<QString, ResolvedProductPtr> products = productsFromProject(project); const QString productName = QString::fromLocal8Bit(QTest::currentDataTag()); ResolvedProductPtr product = products.value(productName); |