diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-20 01:00:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-20 01:00:59 +0100 |
| commit | 1eef06e64fe91dc1f2148477fb932b293fba0312 (patch) | |
| tree | 38a9a2de87bec5e6a45c090ea086f978421bb554 /tests/auto/quick/qquickwindow | |
| parent | 4b0034a01c360ac8b17c9503dba010c56a307c63 (diff) | |
| parent | f726d237277de0f4c8f276d20a5bb1b6a8cd007c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6f320ea43b5837444226228c118e57c4bda8702a
Diffstat (limited to 'tests/auto/quick/qquickwindow')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 82814bd078..604ac0e12e 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1481,7 +1481,7 @@ void tst_qquickwindow::grab() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Skipping due to grabWindow not functional on offscreen/minimimal platforms"); + QSKIP("Skipping due to grabWindow not functional on offscreen/minimal platforms"); QFETCH(bool, visible); QFETCH(bool, alpha); @@ -2533,7 +2533,7 @@ void tst_qquickwindow::testRenderJob() QTRY_COMPARE(RenderJob::deleted, 1); if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "NoStage job fails on offscreen/minimimal platforms", Continue); + QEXPECT_FAIL("", "NoStage job fails on offscreen/minimal platforms", Continue); QCOMPARE(completedJobs.size(), 1); #if QT_CONFIG(opengl) |