From 60997f6a64fe6a9d6e5743db9cbe24b97eaada70 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 17 Oct 2014 14:48:16 +0200 Subject: [PATCH] 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: Robert Loehning Reviewed-by: Tobias Hunger --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 49f4091b789..9ba0c28a040 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -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;