diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-07-07 12:24:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-07-09 20:59:58 +0200 |
| commit | aef0aac581fbbead07be939873e34045137b94ff (patch) | |
| tree | 8c3ba5f67027a1c7fef1ce3e6bbfbc3379558af3 /tests | |
| parent | 03d039fcf255392d52b0fd4b6c47cedf546aa82f (diff) | |
Compile against latest qtbase
Adjust to the lastest changes in QList and QString.
Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicklistview/randomsortmodel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp index aaad5a2b89..41a8b4d057 100644 --- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp +++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp @@ -282,7 +282,7 @@ void tst_qquickanimatedsprite::test_largeAnimation() sprite->setRunning(true); QTRY_VERIFY_WITH_TIMEOUT(!sprite->running(), 100000 /* make sure we wait until its done*/ ); if (frameSync) - QVERIFY(isWithinRange(3*40, frameChangedSpy.count(), 3*40 + 1)); + QVERIFY(isWithinRange(3*40, int(frameChangedSpy.count()), 3*40 + 1)); int prevFrame = -1; int loopCounter = 0; int maxFrame = 0; diff --git a/tests/auto/quick/qquicklistview/randomsortmodel.cpp b/tests/auto/quick/qquicklistview/randomsortmodel.cpp index 7375fe0dbe..65d7fdb6e8 100644 --- a/tests/auto/quick/qquicklistview/randomsortmodel.cpp +++ b/tests/auto/quick/qquicklistview/randomsortmodel.cpp @@ -74,14 +74,14 @@ QVariant RandomSortModel::data(const QModelIndex& index, int role) const void RandomSortModel::randomize() { - const int row = QRandomGenerator::global()->bounded(mData.count()); + const int row = QRandomGenerator::global()->bounded(int(mData.count())); int random; bool exists = false; // Make sure we won't end up with two items with the same weight, as that // would make unit-testing much harder do { exists = false; - random = QRandomGenerator::global()->bounded(mData.count() * 10); + random = QRandomGenerator::global()->bounded(int(mData.count() * 10)); QList<QPair<QString, int> >::ConstIterator iter, end; for (iter = mData.constBegin(), end = mData.constEnd(); iter != end; ++iter) { if ((*iter).second == random) { |