feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmakeProject: Fix mergeLists which lead to cumulative parse being ignored

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

Task-number: QTCREATORBUG-13181
Change-Id: I1a7a639097b38a4ce1de01824be196a0c2781e84
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Daniel Teske
2014-10-17 14:48:16 +02:00
parent 9bcecbe8fb
commit 60997f6a64
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1777,7 +1777,7 @@ static QStringList mergeList(const QStringList &listA, const QStringList &listB)
auto ait = listA.constBegin(); auto ait = listA.constBegin();
auto aend = listA.constEnd(); auto aend = listA.constEnd();
auto bit = listB.constBegin(); auto bit = listB.constBegin();
auto bend = listB.constBegin(); auto bend = listB.constEnd();
while (ait != aend && bit != bend) { while (ait != aend && bit != bend) {
const QString &a = *ait; const QString &a = *ait;
const QString &b = *bit; const QString &b = *bit;