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

Qbs: Fix defines passed on to the code model

Browse Source 
Change-Id: Ibd3cd39578cd08b48c38b888677f04c3e17d24f8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Tobias Hunger
2013-03-21 13:17:51 +01:00
parent 3df6756911
commit 3a95f5cb77
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -470,8 +470,13 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData *prj)
QStringList list = props.getModulePropertiesAsStringList( QStringList list = props.getModulePropertiesAsStringList(
QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_DEFINES)); QLatin1String(CONFIG_DEFINES));
foreach (const QString &def, list) foreach (const QString &def, list) {
grpDefines += (QByteArray("#define ") + def.toUtf8() + '\n'); 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), list = props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE),
QLatin1String(CONFIG_INCLUDEPATHS)); QLatin1String(CONFIG_INCLUDEPATHS));