From ec8f0ff7038d225b95925d2ae97795096bb58b32 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 15 Jul 2021 12:22:22 +0200
Subject: [PATCH] QmlDesigner: Fix testRewriterComponentId

Only attach a single rewriter view.

Change-Id: I5ee4e12c8939e6738803a1d50026ea8b143e9d3b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/coretests/tst_testcore.cpp    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index c512b372cd0..0111b9f0a2e 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -2964,30 +2964,31 @@ void tst_TestCore::testRewriterAddNodeTransaction()
 void tst_TestCore::testRewriterComponentId()
 {
     char qmlString[] = "import QtQuick 2.0\n"
-        "Rectangle {\n"
-        "   Component {\n"
-        "       id: testComponent\n"
-        "       Item {\n"
-        "       }\n"
-        "   }\n"
-        "}\n";
+                       "Rectangle {\n"
+                       "   Component {\n"
+                       "       id: testComponent\n"
+                       "       Item {\n"
+                       "       }\n"
+                       "   }\n"
+                       "}\n";
 
     QPlainTextEdit textEdit;
     textEdit.setPlainText(QLatin1String(qmlString));
     NotIndentingTextEditModifier textModifier(&textEdit);
 
-    QScopedPointer<Model> model(createModel("QtQuick.Rectangle", 2, 1));
+    QScopedPointer<Model> model(Model::create("QtQuick.Item", 2, 0));
     QVERIFY(model.data());
-    QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 2, 1));
 
     QScopedPointer<TestView> view(new TestView(model.data()));
     QVERIFY(view.data());
     model->attachView(view.data());
 
     QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
-    QVERIFY(model->rewriterView());
+    QVERIFY(!model->rewriterView());
     testRewriterView->setTextModifier(&textModifier);
+
     model->attachView(testRewriterView.data());
+    QVERIFY(model->rewriterView());
 
     QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 2, 1));
 
@@ -3738,8 +3739,6 @@ void tst_TestCore::testCopyModelRewriter1()
     QVERIFY(insertedNode.isValid());
     childNode.nodeListProperty("data").reparentHere(insertedNode);
 
-
-
     const QLatin1String expected(
 
         "\n"