diff options
Diffstat (limited to 'tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index cb47a5f2fd..624c296192 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -3774,7 +3774,7 @@ void tst_TestCore::testMergeModelRewriter1_data() QString buttonOutlineExpectedQmlContents = readQmlFromFile(QString(TESTSRCDIR) + "/../data/merging/ButtonOutlineExpected.qml"); QTest::newRow("Simple style replacement") << simpleTemplateQmlContents << simpleStyleQmlContents << simpleExpectedQmlContents; - //QTest::newRow("Complex style replacement") << complexTemplateQmlContents << complexStyleQmlContents << complexExpectedQmlContents; + QTest::newRow("Complex style replacement") << complexTemplateQmlContents << complexStyleQmlContents << complexExpectedQmlContents; QTest::newRow("Empty stylesheet") << emptyTemplateQmlContents << emptyStyleQmlContents << emptyExpectedQmlContents; QTest::newRow("Root node replacement") << rootReplacementTemplateQmlContents << rootReplacementStyleQmlContents << rootReplacementExpectedQmlContents; QTest::newRow("Switch styling") << switchTemplateQmlContents << switchStyleQmlContents << switchExpectedQmlContents; @@ -3828,7 +3828,10 @@ void tst_TestCore::testMergeModelRewriter1() StylesheetMerger merger(templateView.data(), styleView.data()); merger.merge(); - QCOMPARE(textEdit1.toPlainText().trimmed(), qmlExpectedString.trimmed()); + QString trimmedActual = textEdit1.toPlainText().trimmed(); + QString trimmedExpected = qmlExpectedString.trimmed(); + + QCOMPARE(trimmedActual, trimmedExpected); } void tst_TestCore::testCopyModelRewriter2() |