diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 1c0239b542e..ef773427192 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -7336,7 +7336,7 @@ void tst_TestCore::testRewriterChangeId() void tst_TestCore::testRewriterRemoveId() { - const char* qmlString = "import QtQuick 2.1\nRectangle { id: rect }"; + const char* qmlString = "import QtQuick 2.1\nRectangle { id: myRect }"; QPlainTextEdit textEdit; textEdit.setPlainText(QString::fromUtf8(qmlString)); @@ -7355,7 +7355,7 @@ void tst_TestCore::testRewriterRemoveId() ModelNode rootModelNode(view->rootModelNode()); QVERIFY(rootModelNode.isValid()); - QCOMPARE(rootModelNode.id(), QString("rect")); + QCOMPARE(rootModelNode.id(), QString("myRect")); // // remove id in text @@ -8518,7 +8518,7 @@ void tst_TestCore::loadTestFiles() QCOMPARE(rootModelNode.directSubModelNodes().count(), 4); QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200); QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200); - QCOMPARE(rootModelNode.id(), QLatin1String("rect")); + QCOMPARE(rootModelNode.id(), QLatin1String("myRect")); QVERIFY(rootModelNode.hasProperty("data")); QVERIFY(rootModelNode.property("data").isDefaultProperty()); diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml index b0dd3f3d386..a37db5b2d4d 100644 --- a/tests/auto/qml/qmldesigner/data/fx/states.qml +++ b/tests/auto/qml/qmldesigner/data/fx/states.qml @@ -26,7 +26,7 @@ import QtQuick 2.0 Rectangle { - id: rect + id: myRect width: 200 height: 200 Text { @@ -39,7 +39,7 @@ Rectangle { State { name: "State1" PropertyChanges { - target: rect + target: myRect color: "blue" } PropertyChanges { @@ -50,7 +50,7 @@ Rectangle { State { name: "State2" PropertyChanges { - target: rect + target: myRect color: "gray" } PropertyChanges {