diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-21 21:24:24 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-25 09:04:04 +0000 |
| commit | 65c32320dffcfd4299a710ce2632c474f7597beb (patch) | |
| tree | cec14b9804029e786e98bf411eaac0aac3d141a8 | |
| parent | 5e148f1147c533589a24e7781ac227789cb71531 (diff) | |
| download | qt-creator-65c32320dffcfd4299a710ce2632c474f7597beb.tar.gz | |
don't process SOURCES twice
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>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index cd5273fe1c..b21616bf54 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1376,10 +1376,11 @@ QStringList QmakePriFileNode::varNames(FileType type, QtSupport::ProFileReader * foreach (const QString &var, listOfExtraCompilers) { QStringList inputs = readerExact->values(var + QLatin1String(".input")); 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") && input != QLatin1String("STATECHARTS") && input != QLatin1String("RESOURCES") + && input != QLatin1String("SOURCES") && input != QLatin1String("HEADERS")) vars << input; } |