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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Change-Id: I05f76a4f5134c4edd91a79b757bcce9d6e7c258b
This commit is contained in:
Eike Ziller
2014-07-07 09:18:40 +02:00
parent 45fa5f9ccb b435f7bfe8
commit 62aea4728f
363 changed files with 1501 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -80,7 +80,7 @@ bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
}
} // namespace Internal
BuildConfiguration::BuildConfiguration(Target *target, const Core::Id id) :
BuildConfiguration::BuildConfiguration(Target *target, Core::Id id) :
ProjectConfiguration(target, id),
m_clearSystemEnvironment(false),
m_macroExpander(0)