From 056016a1d88e6d03efed871b3aa62a633c07872b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 18 Mar 2020 14:24:29 +0100 Subject: Fix copy-pasted typo minimimal -> minimal Change-Id: I4afef3fdbb9e3c3ec20ba5d00307992131b9ba3e Reviewed-by: Friedemann Kleint --- tests/auto/quick/drawingmodes/tst_drawingmodes.cpp | 14 +++++++------- .../quick/qquickborderimage/tst_qquickborderimage.cpp | 2 +- tests/auto/quick/qquickimage/tst_qquickimage.cpp | 10 +++++----- tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 2 +- .../auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 8 ++++---- .../auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 2 +- .../auto/quick/qquickrectangle/tst_qquickrectangle.cpp | 2 +- tests/auto/quick/qquickshape/tst_qquickshape.cpp | 18 +++++++++--------- tests/auto/quick/qquicktext/tst_qquicktext.cpp | 6 +++--- tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 +- tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 4 ++-- tests/auto/quick/rendernode/tst_rendernode.cpp | 6 +++--- tests/auto/quick/scenegraph/tst_scenegraph.cpp | 2 +- 13 files changed, 39 insertions(+), 39 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp b/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp index 9bcc21c77d..5d69bf3b21 100644 --- a/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp +++ b/tests/auto/quick/drawingmodes/tst_drawingmodes.cpp @@ -154,7 +154,7 @@ void tst_drawingmodes::points() 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"); #ifdef Q_OS_WIN if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) @@ -197,7 +197,7 @@ void tst_drawingmodes::lines() 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 fb = runTest("DrawingModes.qml"); @@ -228,7 +228,7 @@ void tst_drawingmodes::lineStrip() 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 fb = runTest("DrawingModes.qml"); @@ -261,7 +261,7 @@ void tst_drawingmodes::lineLoop() 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"); if (isRunningOnRhi()) QSKIP("Line loops are not supported by some modern graphics APIs - skipping test"); @@ -297,7 +297,7 @@ void tst_drawingmodes::triangles() 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 fb = runTest("DrawingModes.qml"); @@ -326,7 +326,7 @@ void tst_drawingmodes::triangleStrip() 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 fb = runTest("DrawingModes.qml"); @@ -354,7 +354,7 @@ void tst_drawingmodes::triangleFan() 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"); if (isRunningOnRhi()) QSKIP("Triangle fans are not supported by some modern graphics APIs - skipping test"); diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index dc3a783600..858a685796 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -619,7 +619,7 @@ void tst_qquickborderimage::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); diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index f0b44743b9..cf54208d8c 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 screenshots; QList 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); diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 45ecbfde11..f01b3e25f1 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -3399,7 +3399,7 @@ void tst_QQuickItem::grab() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Skipping due to grabToImage not functional on offscreen/minimimal platforms"); + QSKIP("Skipping due to grabToImage not functional on offscreen/minimal platforms"); QQuickView view; view.setSource(testFileUrl("grabToImage.qml")); diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 2f90632841..824db1b080 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -149,7 +149,7 @@ void tst_QQuickItemLayer::layerSmooth() 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 fb = runTest("Smooth.qml"); QVERIFY(!fb.size().isEmpty()); @@ -174,7 +174,7 @@ void tst_QQuickItemLayer::layerEnabled() 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 fb = runTest("Enabled.qml"); QVERIFY(!fb.size().isEmpty()); @@ -210,7 +210,7 @@ void tst_QQuickItemLayer::layerEffect() 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 fb = runTest("Effect.qml"); QVERIFY(!fb.size().isEmpty()); @@ -475,7 +475,7 @@ void tst_QQuickItemLayer::rectangleEffect() { 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 fb = runTest("RectangleEffect.qml"); QVERIFY(!fb.size().isEmpty()); diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 6efa2e6b3a..3503e8a9fd 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -1335,7 +1335,7 @@ void tst_QQuickMouseArea::hoverVisible() { 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 window; QByteArray errorMessage; diff --git a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp index e4d790f466..536280337a 100644 --- a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp +++ b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp @@ -73,7 +73,7 @@ void tst_qquickrectangle::color() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage image = view.grabWindow(); QVERIFY(image.pixel(0,0) == QColor("#020202").rgba()); diff --git a/tests/auto/quick/qquickshape/tst_qquickshape.cpp b/tests/auto/quick/qquickshape/tst_qquickshape.cpp index 851475e2cd..578d8d4e3a 100644 --- a/tests/auto/quick/qquickshape/tst_qquickshape.cpp +++ b/tests/auto/quick/qquickshape/tst_qquickshape.cpp @@ -283,7 +283,7 @@ void tst_QQuickShape::render() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -307,7 +307,7 @@ void tst_QQuickShape::renderWithMultipleSp() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -331,7 +331,7 @@ void tst_QQuickShape::radialGrad() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -355,7 +355,7 @@ void tst_QQuickShape::conicalGrad() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -379,7 +379,7 @@ void tst_QQuickShape::renderPolyline() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -408,7 +408,7 @@ void tst_QQuickShape::renderMultiline() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -474,7 +474,7 @@ void tst_QQuickShape::polylineDataTypes() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -625,7 +625,7 @@ void tst_QQuickShape::multilineDataTypes() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); @@ -673,7 +673,7 @@ void tst_QQuickShape::multilineStronglyTyped() if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); QImage img = window->grabWindow(); QVERIFY(!img.isNull()); diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index a64c9372da..42fdbea58d 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1039,7 +1039,7 @@ void tst_qquicktext::hAlignImplicitWidth() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); // Left Align QImage image = view.grabWindow(); @@ -4493,7 +4493,7 @@ void tst_qquicktext::transparentBackground() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Skipping due to grabToImage not functional on offscreen/minimimal platforms"); + QSKIP("Skipping due to grabToImage not functional on offscreen/minimal platforms"); QScopedPointer window(new QQuickView); window->setSource(testFileUrl("transparentBackground.qml")); @@ -4514,7 +4514,7 @@ void tst_qquicktext::displaySuperscriptedTag() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QSKIP("Skipping due to grabToImage not functional on offscreen/minimimal platforms"); + QSKIP("Skipping due to grabToImage not functional on offscreen/minimal platforms"); QScopedPointer window(new QQuickView); window->setSource(testFileUrl("displaySuperscriptedTag.qml")); diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 85342d4c1e..8ea2ce3bfb 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -927,7 +927,7 @@ void tst_qquicktextedit::hAlignVisual() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) - QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimimal platforms", Abort); + QEXPECT_FAIL("", "Failure due to grabWindow not functional on offscreen/minimal platforms", Abort); // Left Align QImage image = view.grabWindow(); diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 0bf83c267a..22b04eabd8 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); @@ -2539,7 +2539,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) diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp index 6ca5231343..ec248e8210 100644 --- a/tests/auto/quick/rendernode/tst_rendernode.cpp +++ b/tests/auto/quick/rendernode/tst_rendernode.cpp @@ -218,7 +218,7 @@ void tst_rendernode::renderOrder() 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"); if (isRunningOnRhi()) QSKIP("Render nodes not yet supported with QRhi"); @@ -251,7 +251,7 @@ void tst_rendernode::messUpState() 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"); if (isRunningOnRhi()) QSKIP("Render nodes not yet supported with QRhi"); @@ -312,7 +312,7 @@ void tst_rendernode::matrix() { 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"); if (isRunningOnRhi()) QSKIP("Render nodes not yet supported with QRhi"); diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp index 3f605348c3..12f7efb7d5 100644 --- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp +++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp @@ -241,7 +241,7 @@ void tst_SceneGraph::manyWindows() { 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, file); QFETCH(bool, toplevel); -- cgit v1.2.3 From f726d237277de0f4c8f276d20a5bb1b6a8cd007c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 16 Mar 2020 14:50:24 +0100 Subject: qmllint: Break inheritance cycles Previously we would run into infinite loops on those. Mind that qmllint will reject a file called Window.qml that imports QtQuick.Window and then instantiates a Window {}. Such a thing is bad style. Task-number: QTBUG-82817 Change-Id: I6db82ca1794c3020dcb7d7e837fe44f72bca5029 Reviewed-by: Maximilian Goldstein Reviewed-by: Mitch Curtis Reviewed-by: Fabian Kosmale --- tests/auto/qml/qmllint/data/Cycle1.qml | 2 ++ tests/auto/qml/qmllint/data/Cycle2.qml | 2 ++ tests/auto/qml/qmllint/data/Cycle3.qml | 2 ++ tests/auto/qml/qmllint/tst_qmllint.cpp | 4 ++++ 4 files changed, 10 insertions(+) create mode 100644 tests/auto/qml/qmllint/data/Cycle1.qml create mode 100644 tests/auto/qml/qmllint/data/Cycle2.qml create mode 100644 tests/auto/qml/qmllint/data/Cycle3.qml (limited to 'tests/auto') diff --git a/tests/auto/qml/qmllint/data/Cycle1.qml b/tests/auto/qml/qmllint/data/Cycle1.qml new file mode 100644 index 0000000000..8095e9f732 --- /dev/null +++ b/tests/auto/qml/qmllint/data/Cycle1.qml @@ -0,0 +1,2 @@ +import QtQml 2.0 +Cycle2 {} diff --git a/tests/auto/qml/qmllint/data/Cycle2.qml b/tests/auto/qml/qmllint/data/Cycle2.qml new file mode 100644 index 0000000000..90c376fcda --- /dev/null +++ b/tests/auto/qml/qmllint/data/Cycle2.qml @@ -0,0 +1,2 @@ +import QtQml 2.0 +Cycle3 {} diff --git a/tests/auto/qml/qmllint/data/Cycle3.qml b/tests/auto/qml/qmllint/data/Cycle3.qml new file mode 100644 index 0000000000..f4cba68653 --- /dev/null +++ b/tests/auto/qml/qmllint/data/Cycle3.qml @@ -0,0 +1,2 @@ +import QtQml 2.0 +Cycle1 {} diff --git a/tests/auto/qml/qmllint/tst_qmllint.cpp b/tests/auto/qml/qmllint/tst_qmllint.cpp index ed968d6623..8697495a6f 100644 --- a/tests/auto/qml/qmllint/tst_qmllint.cpp +++ b/tests/auto/qml/qmllint/tst_qmllint.cpp @@ -164,6 +164,10 @@ void TestQmllint::dirtyQmlCode_data() << QStringLiteral("incompleteQmltypes.qml") << QString("Warning: Type \"QPalette\" of member \"palette\" not found at 5:26") << QString(); + QTest::newRow("inheritanceCylce") + << QStringLiteral("Cycle1.qml") + << QString("Warning: Cycle2 is part of an inheritance cycle: Cycle2 -> Cycle3 -> Cycle1 -> Cycle2") + << QString(); } void TestQmllint::dirtyQmlCode() -- cgit v1.2.3