aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/genericprojectmanager
diff options
context:
space:
mode:
authorLeander Schulten <Leander.Schulten@rwth-aachen.de>2019-10-24 19:32:48 +0200
committerLeander Schulten <Leander.Schulten@rwth-aachen.de>2019-12-03 13:28:33 +0000
commit6168c3b675bf48a9e038c52cd3f6d9c722c279a7 (patch)
tree726541e3382a5ba4e7ace819b85997e77d1b689e /src/plugins/genericprojectmanager
parentccc81cc760929af726cd8db14ae0fd51bad52984 (diff)
GenericProject: Do not ignore flags that are not in the first line
Now flags in all lines of the .cxxflags and the .cflags files are parsed. Not only the flags in the first lines of these files. Change-Id: I2abddbfce9888dd9cb94aa75b562dc86997bdf48 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 6d5680a89a4..c9ce26c8274 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -406,7 +406,10 @@ static QStringList readFlags(const QString &filePath)
const QStringList lines = readLines(filePath);
if (lines.isEmpty())
return QStringList();
- return QtcProcess::splitArgs(lines.first());
+ QStringList flags;
+ for (const auto &line : lines)
+ flags.append(QtcProcess::splitArgs(line));
+ return flags;
}
void GenericBuildSystem::parse(RefreshOptions options)