From 3a95f5cb775c545f431cab0bccd1d77ac7f0f32c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 21 Mar 2013 13:17:51 +0100 Subject: [PATCH] Qbs: Fix defines passed on to the code model Change-Id: Ibd3cd39578cd08b48c38b888677f04c3e17d24f8 Reviewed-by: Erik Verbruggen --- src/plugins/qbsprojectmanager/qbsproject.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 30bbadc7271..4502f1e1e73 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -470,8 +470,13 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj) QStringList list = props.getModulePropertiesAsStringList( QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_DEFINES)); - foreach (const QString &def, list) - grpDefines += (QByteArray("#define ") + def.toUtf8() + '\n'); + foreach (const QString &def, list) { + QByteArray data = def.toUtf8(); + int pos = data.indexOf('='); + if (pos >= 0) + data[pos] = ' '; + grpDefines += (QByteArray("#define ") + data + '\n'); + } list = props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_INCLUDEPATHS));