summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index faf78f925d..a5bf1ad0b6 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -137,10 +137,15 @@ void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath)
void CompilerOptionsBuilder::addToolchainAndProjectDefines()
{
- QByteArray extendedDefines = m_projectPart.toolchainDefines + m_projectPart.projectDefines;
+ addDefines(m_projectPart.toolchainDefines);
+ addDefines(m_projectPart.projectDefines);
+}
+
+void CompilerOptionsBuilder::addDefines(const QByteArray &defineDirectives)
+{
QStringList result;
- foreach (QByteArray def, extendedDefines.split('\n')) {
+ foreach (QByteArray def, defineDirectives.split('\n')) {
if (def.isEmpty() || excludeDefineLine(def))
continue;