diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-08-28 13:37:45 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-08-28 13:37:45 +0000 |
| commit | 8b748fb5f85d8fa8b1f89d1196b280e8ba8c6282 (patch) | |
| tree | ac8b57c744dfb615f27bf3b409d5cabb61c7001a /tests/auto/revisions/tst_revisions.cpp | |
| parent | 6c35631dd4a399144e473ffefba2716c7f3f1cca (diff) | |
| parent | 2a054d48ef5a412d104aff0389bcaa69ba2c9878 (diff) | |
Merge "Merge branch 'dev' into nativestyle" into wip/nativestyle
Diffstat (limited to 'tests/auto/revisions/tst_revisions.cpp')
| -rw-r--r-- | tests/auto/revisions/tst_revisions.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/revisions/tst_revisions.cpp b/tests/auto/revisions/tst_revisions.cpp index 82b32827..67f890bb 100644 --- a/tests/auto/revisions/tst_revisions.cpp +++ b/tests/auto/revisions/tst_revisions.cpp @@ -86,12 +86,14 @@ void tst_revisions::window_data() QTest::addColumn<QString>("qml"); QTest::addColumn<QString>("error"); - // Qt 5.7: 2.0, Qt 5.8: 2.1 - for (int i = 0; i <= 1; ++i) + // Qt 5.7: 2.0, Qt 5.8: 2.1, Qt 5.9: 2.2 + // Note that we can no longer map the same Screen type to different versions + // in QtQuick and QtQuick.Controls anymore. + for (int i = 0; i <= 2; ++i) QTest::newRow(qPrintable(QString("screen:2.%1").arg(i))) << i << "screen: null" << QString(":1 \"ApplicationWindow.screen\" is not available in QtQuick.Templates 2.%1").arg(i); - // Qt 5.9: 2.2, Qt 5.10: 2.3... - for (int i = 2; i <= 15; ++i) + // Qt 5.10: 2.3... + for (int i = 3; i <= 15; ++i) QTest::newRow(qPrintable(QString("screen:2.%1").arg(i))) << i << "screen: null" << ""; } |