From a2969b1720fc8fbd6cb84562fb62a8c02cbca84a Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Wed, 1 Jul 2020 14:49:21 +0200 Subject: qmlformat: Fix handling of empty blocks Empty blocks were often not handled properly. (i.e. in if, for and while blocks) Fixes: QTBUG-85321 Pick-to: 5.15 Change-Id: I4035dd239a095814362e0aec142b387dc113f282 Reviewed-by: Ulf Hermann --- tests/auto/qml/qmlformat/tst_qmlformat.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp index c3e5f40481..f1fb0d025f 100644 --- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp +++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp @@ -143,10 +143,6 @@ void TestQmlformat::initTestCase() m_invalidFiles << "tests/auto/qml/qqmlecmascript/data/incrDecrSemicolon1.qml"; m_invalidFiles << "tests/auto/qml/qqmlecmascript/data/incrDecrSemicolon_error1.qml"; m_invalidFiles << "tests/auto/qml/qqmlecmascript/data/incrDecrSemicolon2.qml"; - - // QTBUG-85321 - m_invalidFiles << "tests/manual/scenegraph_lancelot/data/shaders/propertyanimation/" - "uniformanimator_stall.qml"; } QStringList TestQmlformat::findFiles(const QDir &d) -- cgit v1.2.3