From cd8ebb21e3445dd1b02f3401cd3c223e14c45c26 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 12 Jun 2019 15:03:23 +0200 Subject: [PATCH] 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 --- .../qmakeprojectmanager/qmakeparsernodes.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 10a09fe9a5d..c9fce5bb9ad 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; }