From 015dbeba3e3b919a42984d17cafbae7ce7b839ad Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 4 Sep 2018 14:35:11 +0200 Subject: [PATCH] QmlDesigner: Stabilize annotation code We have to ensure to replace old blocks if the line breaks have been removed. Change-Id: Ice63d63bd945a3477461311ee7653f0f4cb784e1 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/rewriterview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index f42a125555f..2fa2d6e8eb5 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -902,13 +902,13 @@ void RewriterView::delayedSetup() static QString annotationsEnd() { - const static QString end = QString(" %1*/\n").arg(annotationsEscapeSequence); + const static QString end = QString(" %1*/").arg(annotationsEscapeSequence); return end; } static QString annotationsStart() { - const static QString start = QString("\n/*%1 ").arg(annotationsEscapeSequence); + const static QString start = QString("/*%1 ").arg(annotationsEscapeSequence); return start; } @@ -944,8 +944,8 @@ void RewriterView::writeAuxiliaryData() QString auxData = auxiliaryDataAsQML(); if (!auxData.isEmpty()) { - auxData.prepend(annotationsStart()); - auxData.append(annotationsEnd()); + auxData.prepend("\n" + annotationsStart()); + auxData.append(annotationsEnd() + "\n"); newText.append(auxData); }