summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-06-12 15:03:23 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-06-14 11:18:31 +0000
commitcd8ebb21e3445dd1b02f3401cd3c223e14c45c26 (patch)
treedda00e59a19fa5a6dcf9e1af19c286138e30a6f9
parent885cd63e8f8fa11b4f97cd45c32af2b2b9f7e6ce (diff)
downloadqt-creator-cd8ebb21e3445dd1b02f3401cd3c223e14c45c26.tar.gz
QmakeProjectManager: Make sure OBJECTIVE_HEADERS appear in project tree
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>
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 10a09fe9a5..c9fce5bb9a 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -878,8 +878,7 @@ QStringList QmakePriFile::varNames(FileType type, QtSupport::ProFileReader *read
QStringList vars;
switch (type) {
case FileType::Header:
- vars << QLatin1String("HEADERS");
- vars << QLatin1String("PRECOMPILED_HEADER");
+ vars << "HEADERS" << "OBJECTIVE_HEADERS" << "PRECOMPILED_HEADER";
break;
case FileType::Source: {
vars << QLatin1String("SOURCES");
@@ -888,12 +887,15 @@ QStringList QmakePriFile::varNames(FileType type, QtSupport::ProFileReader *read
QStringList inputs = readerExact->values(var + QLatin1String(".input"));
foreach (const QString &input, inputs)
// 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"))
+ if (input != "FORMS"
+ && input != "STATECHARTS"
+ && input != "RESOURCES"
+ && input != "SOURCES"
+ && input != "HEADERS"
+ && input != "OBJECTIVE_HEADERS"
+ && input != "PRECOMPILED_HEADER") {
vars << input;
+ }
}
break;
}