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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: If9b3a860d7efb561bb710d49396d6bbe13809aa1
This commit is contained in:
Eike Ziller
2017-01-12 10:54:21 +01:00
parent f94a55ee4e 0cdd267260
commit 8d08c601d5
6 changed files with 168 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,6 @@ namespace Internal {
// --------------------------------------------------------------------
static const char CONFIG_CPP_MODULE[] = "cpp";
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";