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

Fix include paths with subfolder

Browse Source 
When an autotools project is using SUBDIRS it starts a new parser. The
new parser object was not propagating includes/defines/flags to the main
parser object, and thus the code model did miss those.
This commit fixes that.

Task-number: QTCREATORBUG-21618
Change-Id: I19ed4dd3820257378e888f3c4935ebd30e958828
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Raoul Hecky
2018-11-30 11:43:27 +01:00
parent 14f66e0eb5
commit 06ff4c6c05
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -291,12 +291,27 @@ void MakefileParser::parseSubDirs()
foreach (const QString& source, parser.sources()) foreach (const QString& source, parser.sources())
m_sources.append(subDir + slash + source); m_sources.append(subDir + slash + source);
// Duplicates might be possible in combination with several // Append the include paths of the sub directory
// "..._SUBDIRS" targets m_includePaths.append(parser.includePaths());
m_makefiles.removeDuplicates();
m_sources.removeDuplicates(); // Append the flags of the sub directory
m_cflags.append(parser.cflags());
m_cxxflags.append(parser.cxxflags());
// Append the macros of the sub directory
foreach (const auto& m, parser.macros())
{
if (!m_macros.contains(m))
m_macros.append(m);
}
} }
// Duplicates might be possible in combination with several
// "..._SUBDIRS" targets
m_makefiles.removeDuplicates();
m_sources.removeDuplicates();
if (subDirs.isEmpty()) if (subDirs.isEmpty())
m_success = false; m_success = false;
} }