From 577c01ce00d939084eaa26156ce983dd169fc686 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 12 Nov 2019 10:40:09 +0100 Subject: [PATCH] QmlDesigner: Split property notifier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib8da8171ff740492ebfd81bd496a2eb7d9061926 Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../components/propertyeditor/propertyeditorvalue.cpp | 3 +++ .../components/propertyeditor/propertyeditorvalue.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index df58f309ec9..c4a928b1ec6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -145,6 +145,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value) emit valueChanged(nameAsQString(), value); emit valueChangedQml(); emit isBoundChanged(); + emit isExplicitChanged(); } } @@ -160,6 +161,8 @@ void PropertyEditorValue::setValue(const QVariant &value) if (m_value.isValid()) emit valueChangedQml(); + + emit isExplicitChanged(); emit isBoundChanged(); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index 99c38feb34d..e74196f55cb 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -77,8 +77,8 @@ class PropertyEditorValue : public QObject Q_PROPERTY(QVariant enumeration READ enumeration NOTIFY valueChangedQml) Q_PROPERTY(QString expression READ expression WRITE setExpressionWithEmit NOTIFY expressionChanged FINAL) Q_PROPERTY(QString valueToString READ valueToString NOTIFY valueChangedQml FINAL) - Q_PROPERTY(bool isInModel READ isInModel NOTIFY valueChangedQml FINAL) - Q_PROPERTY(bool isInSubState READ isInSubState NOTIFY valueChangedQml FINAL) + Q_PROPERTY(bool isInModel READ isInModel NOTIFY isExplicitChanged FINAL) + Q_PROPERTY(bool isInSubState READ isInSubState NOTIFY isExplicitChanged FINAL) Q_PROPERTY(bool isBound READ isBound NOTIFY isBoundChanged FINAL) Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged FINAL) Q_PROPERTY(bool isTranslated READ isTranslated NOTIFY expressionChanged FINAL) @@ -147,6 +147,7 @@ signals: void complexNodeChanged(); void isBoundChanged(); void isValidChanged(); + void isExplicitChanged(); private: //variables QmlDesigner::ModelNode m_modelNode;