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

AutoTools: Handle "-I /some/path" as well as "-I/some/path"

Browse Source 
Do the same for -D and -U.

Change-Id: I66ea3c03a58e59602e70f6eb39c471cdf063b456
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-09 01:32:29 +02:00
committed by Tobias Hunger
parent 0e7e521a0a
commit bc7ef69363
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -445,7 +445,20 @@ QStringList MakefileParser::parseTermsAfterAssign(const QString &line)
int assignPos = line.indexOf(QLatin1Char('=')) + 1;
if (assignPos >= line.size())
return QStringList();
return line.mid(assignPos).split(QLatin1Char(' '), QString::SkipEmptyParts);
const QStringList parts = line.mid(assignPos).split(QLatin1Char(' '), QString::SkipEmptyParts);
QStringList result;
for (int i = 0; i < parts.count(); ++i) {
const QString cur = parts.at(i);
const QString next = (i == parts.count() - 1) ? QString() : parts.at(i + 1);
if (cur == QLatin1String("-D") || cur == QLatin1String("-U") || cur == QLatin1String("-I")) {
result << cur + next;
++i;
} else {
result << cur;
}
}
return result;
}
bool MakefileParser::maybeParseDefine(const QString &term)