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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/baremetal/gdbserverproviderprocess.cpp

Change-Id: I1ba618db9db6669edada6477c05a1b56b7b5b430
This commit is contained in:
Eike Ziller
2015-12-07 15:55:17 +01:00
parent 11cb55a21f 89d8693107
commit 9554495bb1
41 changed files with 464 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -749,9 +749,10 @@ BuildConfiguration *QmakeBuildConfigurationFactory::restore(Target *parent, cons
BuildConfiguration::BuildType QmakeBuildConfiguration::buildType() const
{
QMakeStep *qs = qmakeStep();
if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild)
return Debug;
else if (qmakeStep()->separateDebugInfo())
else if (qs && qs->separateDebugInfo())
return Profile;
else
return Release;