Merge remote-tracking branch 'origin/4.7'

Change-Id: I562b0b8afb98940e03b67cbd7d7c3e756b77d736
2018-09-14 09:59:48 +02:00
parent 29c07f4859 baf8cac967
commit 4c914c6b43
9 changed files with 16 additions and 3 deletions
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -173,8 +173,11 @@ protected:
        QStringList lines = str.split(QLatin1Char('\n'));
        bool multiline = lines.length() > 1;
        for (int i = 0; i < lines.size(); ++i) {
-            if (multiline)
+            if (multiline) {
+                if (i == 0)
+                    newLine();
                _line = lines.at(i);  // multiline comments don't keep track of previos lines
+            }
            else
                _line += lines.at(i);
            if (i != lines.size() - 1)