forked from qt-creator/qt-creator
QmlDesigner: Fix property editor value setter
Fix property editor value setValueWithEmit and setExpressionWithEmit by resetting the other. Task-number: QDS-3800 Change-Id: I7729c0b9fbac7eacce665d00d79a69e8ee7a5f90 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
committed by
Henning Gründl
parent
a995a4633f
commit
91241d86de
@@ -144,6 +144,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
|
|||||||
|
|
||||||
setValue(newValue);
|
setValue(newValue);
|
||||||
m_isBound = false;
|
m_isBound = false;
|
||||||
|
m_expression.clear();
|
||||||
emit valueChanged(nameAsQString(), value);
|
emit valueChanged(nameAsQString(), value);
|
||||||
emit valueChangedQml();
|
emit valueChangedQml();
|
||||||
emit isBoundChanged();
|
emit isBoundChanged();
|
||||||
@@ -182,6 +183,7 @@ void PropertyEditorValue::setExpressionWithEmit(const QString &expression)
|
|||||||
{
|
{
|
||||||
if ( m_expression != expression) {
|
if ( m_expression != expression) {
|
||||||
setExpression(expression);
|
setExpression(expression);
|
||||||
|
m_value.clear();
|
||||||
emit expressionChanged(nameAsQString());
|
emit expressionChanged(nameAsQString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user