From 12aa10158a9e63a12f5ab6a3b8ada9ad832a36f5 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 14 Jun 2016 15:02:08 +0200
Subject: [PATCH] QmlDesigner: Normalize expressions

We have to remove whitespaces and ';' to normalize expressions.
Otherwise expressions can change when rewriting.

Change-Id: I0085a5a46c4caa2815a4e7f4f76658a4df49de75
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../qmldesigner/designercore/model/texttomodelmerger.cpp    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index b8bf97310ea..4dabb596c13 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -1087,6 +1087,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
                 astValue = textAt(context->doc(),
                                   property->statement->firstSourceLocation(),
                                   property->statement->lastSourceLocation());
+
+            astValue = astValue.trimmed();
+            if (astValue.endsWith(QLatin1Char(';')))
+                astValue = astValue.left(astValue.length() - 1);
+            astValue = astValue.trimmed();
+
             const TypeName &astType = property->memberType.toUtf8();
             AbstractProperty modelProperty = modelNode.property(astName.toUtf8());
             if (!property->statement || isLiteralValue(property->statement)) {