Commit 60997f6a authored by Daniel Teske's avatar Daniel Teske

QmakeProject: Fix mergeLists which lead to cumulative parse being ignored

Any .pri files only found via cumulative parsing were ignored.

Task-number: QTCREATORBUG-13181
Change-Id: I1a7a639097b38a4ce1de01824be196a0c2781e84
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 9bcecbe8
......@@ -1777,7 +1777,7 @@ static QStringList mergeList(const QStringList &listA, const QStringList &listB)
auto ait = listA.constBegin();
auto aend = listA.constEnd();
auto bit = listB.constBegin();
auto bend = listB.constBegin();
auto bend = listB.constEnd();
while (ait != aend && bit != bend) {
const QString &a = *ait;
const QString &b = *bit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment