feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix testRewriterComponentId

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2021-07-15 12:22:22 +02:00
parent ae16958fd8
commit ec8f0ff703
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -2976,18 +2976,19 @@ void tst_TestCore::testRewriterComponentId()
textEdit.setPlainText(QLatin1String(qmlString)); textEdit.setPlainText(QLatin1String(qmlString));
NotIndentingTextEditModifier textModifier(&textEdit); 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.data());
QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 2, 1));
QScopedPointer<TestView> view(new TestView(model.data())); QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data()); QVERIFY(view.data());
model->attachView(view.data()); model->attachView(view.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView()); QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
QVERIFY(model->rewriterView()); QVERIFY(!model->rewriterView());
testRewriterView->setTextModifier(&textModifier); testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data()); model->attachView(testRewriterView.data());
QVERIFY(model->rewriterView());
QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 2, 1)); QVERIFY(model->hasNodeMetaInfo("QtQuick.Item", 2, 1));
@@ -3738,8 +3739,6 @@ void tst_TestCore::testCopyModelRewriter1()
QVERIFY(insertedNode.isValid()); QVERIFY(insertedNode.isValid());
childNode.nodeListProperty("data").reparentHere(insertedNode); childNode.nodeListProperty("data").reparentHere(insertedNode);
const QLatin1String expected( const QLatin1String expected(
"\n" "\n"