forked from qt-creator/qt-creator
QmlDesigner: Remove finishedNotify
It is not used anymore. Change-Id: I706a973c55c22211457bac01534a5e7b59a40b25 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
@@ -119,18 +119,13 @@ void PropertyEditorView::setupPane(const TypeName &typeName)
|
|||||||
if (!qmlBackend) {
|
if (!qmlBackend) {
|
||||||
qmlBackend = new PropertyEditorQmlBackend(this);
|
qmlBackend = new PropertyEditorQmlBackend(this);
|
||||||
|
|
||||||
qmlBackend->context()->setContextProperty("finishedNotify", QVariant(false) );
|
|
||||||
qmlBackend->initialSetup(typeName, qmlSpecificsFile, this);
|
qmlBackend->initialSetup(typeName, qmlSpecificsFile, this);
|
||||||
qmlBackend->setSource(qmlFile);
|
qmlBackend->setSource(qmlFile);
|
||||||
qmlBackend->context()->setContextProperty("finishedNotify", QVariant(true) );
|
|
||||||
|
|
||||||
m_stackedWidget->addWidget(qmlBackend->widget());
|
m_stackedWidget->addWidget(qmlBackend->widget());
|
||||||
m_qmlBackendHash.insert(qmlFile.toString(), qmlBackend);
|
m_qmlBackendHash.insert(qmlFile.toString(), qmlBackend);
|
||||||
} else {
|
} else {
|
||||||
qmlBackend->context()->setContextProperty("finishedNotify", QVariant(false) );
|
|
||||||
|
|
||||||
qmlBackend->initialSetup(typeName, qmlSpecificsFile, this);
|
qmlBackend->initialSetup(typeName, qmlSpecificsFile, this);
|
||||||
qmlBackend->context()->setContextProperty("finishedNotify", QVariant(true) );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -499,14 +494,13 @@ void PropertyEditorView::setupQmlBackend()
|
|||||||
} else {
|
} else {
|
||||||
qmlObjectNode.reset(new QmlObjectNode);
|
qmlObjectNode.reset(new QmlObjectNode);
|
||||||
}
|
}
|
||||||
currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(false));
|
|
||||||
if (specificQmlData.isEmpty())
|
if (specificQmlData.isEmpty())
|
||||||
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
||||||
|
|
||||||
currentQmlBackend->contextObject()->setGlobalBaseUrl(qmlFile);
|
currentQmlBackend->contextObject()->setGlobalBaseUrl(qmlFile);
|
||||||
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
||||||
currentQmlBackend->setSource(qmlFile);
|
currentQmlBackend->setSource(qmlFile);
|
||||||
currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(true));
|
|
||||||
} else {
|
} else {
|
||||||
QScopedPointer<QmlObjectNode> qmlObjectNode;
|
QScopedPointer<QmlObjectNode> qmlObjectNode;
|
||||||
if (m_selectedNode.isValid())
|
if (m_selectedNode.isValid())
|
||||||
@@ -514,7 +508,6 @@ void PropertyEditorView::setupQmlBackend()
|
|||||||
else
|
else
|
||||||
qmlObjectNode.reset(new QmlObjectNode);
|
qmlObjectNode.reset(new QmlObjectNode);
|
||||||
|
|
||||||
currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(false));
|
|
||||||
if (specificQmlData.isEmpty())
|
if (specificQmlData.isEmpty())
|
||||||
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
|
||||||
currentQmlBackend->setup(*qmlObjectNode, currentStateName, qmlSpecificsFile, this);
|
currentQmlBackend->setup(*qmlObjectNode, currentStateName, qmlSpecificsFile, this);
|
||||||
@@ -524,8 +517,6 @@ void PropertyEditorView::setupQmlBackend()
|
|||||||
|
|
||||||
m_stackedWidget->setCurrentWidget(currentQmlBackend->widget());
|
m_stackedWidget->setCurrentWidget(currentQmlBackend->widget());
|
||||||
|
|
||||||
currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(true));
|
|
||||||
|
|
||||||
currentQmlBackend->contextObject()->triggerSelectionChanged();
|
currentQmlBackend->contextObject()->triggerSelectionChanged();
|
||||||
|
|
||||||
m_qmlBackEndForCurrentType = currentQmlBackend;
|
m_qmlBackEndForCurrentType = currentQmlBackend;
|
||||||
|
Reference in New Issue
Block a user