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/qquickimage | |
| parent | 4b0034a01c360ac8b17c9503dba010c56a307c63 (diff) | |
| parent | f726d237277de0f4c8f276d20a5bb1b6a8cd007c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6f320ea43b5837444226228c118e57c4bda8702a
Diffstat (limited to 'tests/auto/quick/qquickimage')
| -rw-r--r-- | tests/auto/quick/qquickimage/tst_qquickimage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 5dca698cfe..a9defe7b70 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -341,7 +341,7 @@ void tst_qquickimage::mirror() { 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"); QMap<QQuickImage::FillMode, QImage> screenshots; QList<QQuickImage::FillMode> fillModes; @@ -556,7 +556,7 @@ void tst_qquickimage::tiling_QTBUG_6716() { 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(QString, source); @@ -930,7 +930,7 @@ void tst_qquickimage::sourceClipRect() 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"); QImage contents = window->grabWindow(); if (contents.width() < sourceClipRect.width()) QSKIP("Skipping due to grabWindow not functional"); @@ -1159,7 +1159,7 @@ void tst_qquickimage::hugeImages() { 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"); QQuickView view; view.setSource(testFileUrl("hugeImages.qml")); @@ -1217,7 +1217,7 @@ void tst_qquickimage::multiFrame() { 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(QString, qmlfile); QFETCH(bool, asynchronous); |