forked from qt-creator/qt-creator
avoid detaching
amazingly enough, qlist::{first,last}() have non-const versions, which are of course used when you least expect it ...
This commit is contained in:
@@ -1800,15 +1800,16 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
|
|||||||
appendString(replacement.join(statics.field_sep),
|
appendString(replacement.join(statics.field_sep),
|
||||||
¤t, &ptr, &pending);
|
¤t, &ptr, &pending);
|
||||||
} else {
|
} else {
|
||||||
appendString(replacement.first(), ¤t, &ptr, &pending);
|
appendString(replacement.at(0), ¤t, &ptr, &pending);
|
||||||
if (replacement.size() > 1) {
|
if (replacement.size() > 1) {
|
||||||
flushCurrent(&ret, ¤t, &ptr, &pending);
|
flushCurrent(&ret, ¤t, &ptr, &pending);
|
||||||
pending = replacement.last();
|
int j = 1;
|
||||||
if (replacement.size() > 2) {
|
if (replacement.size() > 2) {
|
||||||
// FIXME: ret.reserve(ret.size() + replacement.size() - 2);
|
// FIXME: ret.reserve(ret.size() + replacement.size() - 2);
|
||||||
for (int i = 1; i < replacement.size() - 1; ++i)
|
for (; j < replacement.size() - 1; ++j)
|
||||||
ret << replacement.at(i);
|
ret << replacement.at(j);
|
||||||
}
|
}
|
||||||
|
pending = replacement.at(j);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
replaced = true;
|
replaced = true;
|
||||||
|
Reference in New Issue
Block a user