Merge remote-tracking branch 'origin/4.2'

Change-Id: I575f1cf98f2a4740577cdd94da21687d3392cdb7
2016-11-30 15:09:07 +01:00
parent a00ee753fe ac2ceb36d7
commit e487b3bd55
24 changed files with 172 additions and 132 deletions
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -282,6 +282,15 @@ protected:
    {
        BestSplit result;

+        while (possibleSplits.count() > 12) {
+             QList<Split> newPossibleSplits;
+             for (int i = 0; i < possibleSplits.count(); i++) {
+                 if (!(i % 2))
+                     newPossibleSplits.push_back(possibleSplits.at(i));
+             }
+             possibleSplits = newPossibleSplits;
+        }
+
        result.badnessFromSplits = 0;
        result.lines = QStringList(line);