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

don't process SOURCES twice

Browse Source 
moc.prf also adds an extra compiler which takes SOURCES as input. as we
add it to the list manually, we have to filter it just like HEADERS.

Change-Id: I81b8b68965c1b65fd0cef6a68c01ad00d51d6dee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oswald Buddenhagen
2016-10-21 21:24:24 +02:00
parent 5e148f1147
commit 65c32320df
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1376,10 +1376,11 @@ QStringList QmakePriFileNode::varNames(FileType type, QtSupport::ProFileReader *
foreach (const QString &var, listOfExtraCompilers) { foreach (const QString &var, listOfExtraCompilers) {
QStringList inputs = readerExact->values(var + QLatin1String(".input")); QStringList inputs = readerExact->values(var + QLatin1String(".input"));
foreach (const QString &input, inputs) foreach (const QString &input, inputs)
// FORMS, RESOURCES, and STATECHARTS are handled below, HEADERS above // FORMS, RESOURCES, and STATECHARTS are handled below, HEADERS and SOURCES above
if (input != QLatin1String("FORMS") if (input != QLatin1String("FORMS")
&& input != QLatin1String("STATECHARTS") && input != QLatin1String("STATECHARTS")
&& input != QLatin1String("RESOURCES") && input != QLatin1String("RESOURCES")
&& input != QLatin1String("SOURCES")
&& input != QLatin1String("HEADERS")) && input != QLatin1String("HEADERS"))
vars << input; vars << input;
} }