diff options
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index fb5d0c6861..75681f6468 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -119,18 +119,13 @@ void PropertyEditorView::setupPane(const TypeName &typeName) if (!qmlBackend) { qmlBackend = new PropertyEditorQmlBackend(this); - qmlBackend->context()->setContextProperty("finishedNotify", QVariant(false) ); qmlBackend->initialSetup(typeName, qmlSpecificsFile, this); qmlBackend->setSource(qmlFile); - qmlBackend->context()->setContextProperty("finishedNotify", QVariant(true) ); m_stackedWidget->addWidget(qmlBackend->widget()); m_qmlBackendHash.insert(qmlFile.toString(), qmlBackend); } else { - qmlBackend->context()->setContextProperty("finishedNotify", QVariant(false) ); - qmlBackend->initialSetup(typeName, qmlSpecificsFile, this); - qmlBackend->context()->setContextProperty("finishedNotify", QVariant(true) ); } } @@ -499,14 +494,13 @@ void PropertyEditorView::setupQmlBackend() } else { qmlObjectNode.reset(new QmlObjectNode); } - currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(false)); + if (specificQmlData.isEmpty()) currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->contextObject()->setGlobalBaseUrl(qmlFile); currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->setSource(qmlFile); - currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(true)); } else { QScopedPointer<QmlObjectNode> qmlObjectNode; if (m_selectedNode.isValid()) @@ -514,7 +508,6 @@ void PropertyEditorView::setupQmlBackend() else qmlObjectNode.reset(new QmlObjectNode); - currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(false)); if (specificQmlData.isEmpty()) currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->setup(*qmlObjectNode, currentStateName, qmlSpecificsFile, this); @@ -524,8 +517,6 @@ void PropertyEditorView::setupQmlBackend() m_stackedWidget->setCurrentWidget(currentQmlBackend->widget()); - currentQmlBackend->context()->setContextProperty("finishedNotify", QVariant(true)); - currentQmlBackend->contextObject()->triggerSelectionChanged(); m_qmlBackEndForCurrentType = currentQmlBackend; |