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

Merge remote-tracking branch 'origin/4.8' into 4.9

Browse Source 
Conflicts:
	qtcreator.pri

Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
This commit is contained in:
Eike Ziller
2019-02-08 12:44:49 +01:00
parent dbf7c9f658 e27744e966
commit d07d75a08a
5 changed files with 95 additions and 6 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())
m_sources.append(subDir + slash + source);
// Duplicates might be possible in combination with several
// "..._SUBDIRS" targets
m_makefiles.removeDuplicates();
m_sources.removeDuplicates();
// Append the include paths of the sub directory
m_includePaths.append(parser.includePaths());
// 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())
m_success = false;
}