diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-30 12:11:32 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-30 15:15:25 +0000 |
| commit | d54f7b0eb2252690267d4207fed3cd2d753bb7e9 (patch) | |
| tree | 9a85eaeb434c8f63a455a298d7a90d335c236534 /tests/auto/algorithm/tst_algorithm.cpp | |
| parent | 659771f09b4a781d206ff4b5829a6186b1fe7af7 (diff) | |
| download | qt-creator-d54f7b0eb2252690267d4207fed3cd2d753bb7e9.tar.gz | |
Fix building tests with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I192245125f04f8350597bbe481d80d3f8ba0cae0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/algorithm/tst_algorithm.cpp')
| -rw-r--r-- | tests/auto/algorithm/tst_algorithm.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/tests/auto/algorithm/tst_algorithm.cpp b/tests/auto/algorithm/tst_algorithm.cpp index 14d30f7547..3cc0301e81 100644 --- a/tests/auto/algorithm/tst_algorithm.cpp +++ b/tests/auto/algorithm/tst_algorithm.cpp @@ -37,6 +37,8 @@ // initializer_list related code on the templates inside algorithm.h #include <utils/algorithm.h> +#include <utils/porting.h> + class tst_Algorithm : public QObject { Q_OBJECT @@ -112,8 +114,8 @@ void tst_Algorithm::transform() QCOMPARE(i1, QList<int>({1, 3, 132})); const QList<int> i2 = Utils::transform(strings, stringToInt); QCOMPARE(i2, QList<int>({1, 3, 132})); - const QList<int> i3 = Utils::transform(strings, &QString::size); - QCOMPARE(i3, QList<int>({1, 1, 3})); + const QList<Utils::QtSizeType> i3 = Utils::transform(strings, &QString::size); + QCOMPARE(i3, QList<Utils::QtSizeType>({1, 1, 3})); } { // QStringList @@ -122,8 +124,8 @@ void tst_Algorithm::transform() QCOMPARE(i1, QList<int>({1, 3, 132})); const QList<int> i2 = Utils::transform(strings, stringToInt); QCOMPARE(i2, QList<int>({1, 3, 132})); - const QList<int> i3 = Utils::transform(strings, &QString::size); - QCOMPARE(i3, QList<int>({1, 1, 3})); + const QList<Utils::QtSizeType> i3 = Utils::transform(strings, &QString::size); + QCOMPARE(i3, QList<Utils::QtSizeType>({1, 1, 3})); } { // QSet internally needs special inserter @@ -132,8 +134,8 @@ void tst_Algorithm::transform() QCOMPARE(i1, QSet<int>({1, 3, 132})); const QSet<int> i2 = Utils::transform(strings, stringToInt); QCOMPARE(i2, QSet<int>({1, 3, 132})); - const QSet<int> i3 = Utils::transform(strings, &QString::size); - QCOMPARE(i3, QSet<int>({1, 3})); + const QSet<Utils::QtSizeType> i3 = Utils::transform(strings, &QString::size); + QCOMPARE(i3, QSet<Utils::QtSizeType>({1, 3})); } // different container types @@ -144,8 +146,8 @@ void tst_Algorithm::transform() QCOMPARE(i1, QSet<int>({1, 3, 132})); const QSet<int> i2 = Utils::transform<QSet>(strings, stringToInt); QCOMPARE(i2, QSet<int>({1, 3, 132})); - const QSet<int> i3 = Utils::transform<QSet>(strings, &QString::size); - QCOMPARE(i3, QSet<int>({1, 3})); + const QSet<Utils::QtSizeType> i3 = Utils::transform<QSet>(strings, &QString::size); + QCOMPARE(i3, QSet<Utils::QtSizeType>({1, 3})); } { // QStringList to QSet @@ -154,8 +156,8 @@ void tst_Algorithm::transform() QCOMPARE(i1, QSet<int>({1, 3, 132})); const QSet<int> i2 = Utils::transform<QSet>(strings, stringToInt); QCOMPARE(i2, QSet<int>({1, 3, 132})); - const QSet<int> i3 = Utils::transform<QSet>(strings, &QString::size); - QCOMPARE(i3, QSet<int>({1, 3})); + const QSet<Utils::QtSizeType> i3 = Utils::transform<QSet>(strings, &QString::size); + QCOMPARE(i3, QSet<Utils::QtSizeType>({1, 3})); } { // QSet to QList @@ -166,9 +168,9 @@ void tst_Algorithm::transform() QList<int> i2 = Utils::transform<QList>(strings, stringToInt); Utils::sort(i2); QCOMPARE(i2, QList<int>({1, 3, 132})); - QList<int> i3 = Utils::transform<QList>(strings, &QString::size); + QList<Utils::QtSizeType> i3 = Utils::transform<QList>(strings, &QString::size); Utils::sort(i3); - QCOMPARE(i3, QList<int>({1, 1, 3})); + QCOMPARE(i3, QList<Utils::QtSizeType>({1, 1, 3})); } { const QList<Struct> list({4, 3, 2, 1, 2}); |