From 91241d86de7aefb46a31b3bc45155a493fe09665 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 25 Feb 2021 13:51:24 +0100
Subject: [PATCH] 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>
---
 .../components/propertyeditor/propertyeditorvalue.cpp           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 890629e4fd5..ec78ed97afd 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -144,6 +144,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
 
         setValue(newValue);
         m_isBound = false;
+        m_expression.clear();
         emit valueChanged(nameAsQString(), value);
         emit valueChangedQml();
         emit isBoundChanged();
@@ -182,6 +183,7 @@ void PropertyEditorValue::setExpressionWithEmit(const QString &expression)
 {
     if ( m_expression != expression) {
         setExpression(expression);
+        m_value.clear();
         emit expressionChanged(nameAsQString());
     }
 }