From c4fb13a652dba9a2e30207a16a725e2a2c3f19f7 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 13 Nov 2014 12:16:25 +0100
Subject: [PATCH] Qbs: Make pass on cpp.defines correctly to the C++ code model
When passing -DFOO to the compiler it will treat that as similar
to "#define FOO 1". Do the same when passing FOO on to the code
model.
Task-number: QTCREATORBUG-13384
Change-Id: I236d4731435e0559f75a3435dad9a8d935d42042
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
---
src/plugins/qbsprojectmanager/qbsproject.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 85d64738a8..8b2c2bfe01 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -727,6 +727,8 @@ void QbsProject::updateCppCodeModel()
int pos = data.indexOf('=');
if (pos >= 0)
data[pos] = ' ';
+ else
+ data.append(" 1"); // cpp.defines: [ "FOO" ] is considered to be "FOO=1"
grpDefines += (QByteArray("#define ") + data + '\n');
}
ppBuilder.setDefines(grpDefines);
--
GitLab