summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-05-10 15:33:31 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-06-03 10:20:55 +0000
commit23f873ccbca7908b48fb161ffc8e8c7311bbc172 (patch)
tree2f811bc1f901ccf442f535473a3f8f83f1d72044
parent7c3013a54aeadad57ad98459a4015a8e4f86a4e9 (diff)
downloadqt-creator-23f873ccbca7908b48fb161ffc8e8c7311bbc172.tar.gz
QmlDesigner: Crash fix
Trimm expression to avoid ambiguity that leads to assert. Task-number: QTCREATORBUG-16059 Change-Id: Id5f0378e38f0edeba22236c6e9519c8107e4a311 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
-rw-r--r--src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp
index 58f3a5fd28..b84360c49e 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp
@@ -327,8 +327,8 @@ void BindingModel::updateExpression(int row)
{
BindingProperty bindingProperty = bindingPropertyForRow(row);
- const QString sourceNode = data(index(row, SourceModelNodeRow)).toString();
- const QString sourceProperty = data(index(row, SourcePropertyNameRow)).toString();
+ const QString sourceNode = data(index(row, SourceModelNodeRow)).toString().trimmed();
+ const QString sourceProperty = data(index(row, SourcePropertyNameRow)).toString().trimmed();
QString expression;
if (sourceProperty.isEmpty()) {