From 75ff5062d686d6a19ba4fcab35aabc8417dc1265 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 23 Jul 2014 10:48:29 +0200 Subject: [PATCH] Qbs: Read systemIncludePath and make them available to the code model Change-Id: Ie16501a78e95f9c50631e5af8e9e8857dfd65b2f Reviewed-by: Christian Kandeler Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsproject.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 45a26e3a5d4..cc963c449ac 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -86,7 +86,9 @@ static const char CONFIG_CXXFLAGS[] = "cxxFlags"; static const char CONFIG_CFLAGS[] = "cFlags"; static const char CONFIG_DEFINES[] = "defines"; static const char CONFIG_INCLUDEPATHS[] = "includePaths"; +static const char CONFIG_SYSTEM_INCLUDEPATHS[] = "systemIncludePaths"; static const char CONFIG_FRAMEWORKPATHS[] = "frameworkPaths"; +static const char CONFIG_SYSTEM_FRAMEWORKPATHS[] = "systemFrameworkPaths"; static const char CONFIG_PRECOMPILEDHEADER[] = "precompiledHeader"; static const char CONFIGURATION_PATH[] = ""; @@ -655,6 +657,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) list = props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_INCLUDEPATHS)); + list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), + QLatin1String(CONFIG_SYSTEM_INCLUDEPATHS))); CppTools::ProjectPart::HeaderPaths grpHeaderPaths; foreach (const QString &p, list) grpHeaderPaths += CppTools::ProjectPart::HeaderPath( @@ -663,6 +667,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj) list = props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), QLatin1String(CONFIG_FRAMEWORKPATHS)); + list.append(props.getModulePropertiesAsStringList(QLatin1String(CONFIG_CPP_MODULE), + QLatin1String(CONFIG_SYSTEM_FRAMEWORKPATHS))); foreach (const QString &p, list) grpHeaderPaths += CppTools::ProjectPart::HeaderPath( FileName::fromUserInput(p).toString(),