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

QmakeProjectManager: Make sure OBJECTIVE_HEADERS appear in project tree

Browse Source 
We do not introduce another category, but list them under "Headers", as
we do with PRECOMPILED_HEADER entries.

Fixes: QTCREATORBUG-17569
Change-Id: Ie0e6efdd09715daf2802b126a4ecbdc20b25d008
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2019-06-12 15:03:23 +02:00
parent 885cd63e8f
commit cd8ebb21e3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -878,8 +878,7 @@ QStringList QmakePriFile::varNames(FileType type, QtSupport::ProFileReader *read
QStringList vars; QStringList vars;
switch (type) { switch (type) {
case FileType::Header: case FileType::Header:
vars << QLatin1String("HEADERS"); vars << "HEADERS" << "OBJECTIVE_HEADERS" << "PRECOMPILED_HEADER";
vars << QLatin1String("PRECOMPILED_HEADER");
break; break;
case FileType::Source: { case FileType::Source: {
vars << QLatin1String("SOURCES"); vars << QLatin1String("SOURCES");
@@ -888,12 +887,15 @@ QStringList QmakePriFile::varNames(FileType type, QtSupport::ProFileReader *read
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 and SOURCES above // FORMS, RESOURCES, and STATECHARTS are handled below, HEADERS and SOURCES above
if (input != QLatin1String("FORMS") if (input != "FORMS"
&& input != QLatin1String("STATECHARTS") && input != "STATECHARTS"
&& input != QLatin1String("RESOURCES") && input != "RESOURCES"
&& input != QLatin1String("SOURCES") && input != "SOURCES"
&& input != QLatin1String("HEADERS")) && input != "HEADERS"
&& input != "OBJECTIVE_HEADERS"
&& input != "PRECOMPILED_HEADER") {
vars << input; vars << input;
}
} }
break; break;
} }