Merge remote-tracking branch 'origin/4.12'

Change-Id: I79083060dfc3bc4408123acd3b7305b9701650fd

1 files changed, 7 insertions, 2 deletions

diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp
index 52d49751f2..e3fcc5f600 100644
--- a/src/shared/proparser/prowriter.cpp
+++ b/src/shared/proparser/prowriter.cpp
@@ -471,12 +471,17 @@ QList<int> ProWriter::removeVarValues(ProFile *profile, QStringList *lines,
 
     // This code expects proVars to be sorted by the variables' appearance in the file.
     int delta = 1;
-    for (const VarLocation &loc : qAsConst(varLocations)) {
+    for (int varIndex = 0; varIndex < varLocations.count(); ++varIndex) {
+       const VarLocation &loc = varLocations[varIndex];
        bool first = true;
        int lineNo = loc.second - delta;
        typedef QPair<int, int> ContPos;
        QList<ContPos> contPos;
-       while (lineNo < lines->count()) {
+       const auto nextSegmentStart = [varIndex, lines, &delta, &varLocations] {
+           return varIndex == varLocations.count() - 1
+                   ? lines->count() : varLocations[varIndex + 1].second - delta;
+       };
+       while (lineNo < nextSegmentStart()) {
            QString &line = (*lines)[lineNo];
            int lineLen = line.length();
            bool killed = false;