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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
This commit is contained in:
Eike Ziller
2013-11-06 14:02:08 +01:00
parent f85c200244 fbd3f73594
commit 49b7e95e7f
358 changed files with 3130 additions and 107477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -36,7 +36,7 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/helpmanager.h>
#include <qtsupport/qtkitinformation.h>
#include <projectexplorer/environmentaspect.h>
#include <projectexplorer/localenvironmentaspect.h>
#include <projectexplorer/target.h>
#include <utils/pathchooser.h>
@@ -75,6 +75,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(ProjectExplorer::Target *parent, Co
m_title(title),
m_enabled(true)
{
addExtraAspect(new ProjectExplorer::LocalEnvironmentAspect(this));
ctor();
}