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/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
This commit is contained in:
Eike Ziller
2016-02-24 10:08:37 +01:00
parent eaffeb081e 80d93ab52a
commit 74cdce071f
18 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/session.cpp
View File

@@ -327,7 +327,7 @@ void SessionManager::setActiveBuildConfiguration(Target *target, BuildConfigurat
if (otherProject == target->project())
continue;
Target *otherTarget = otherProject->activeTarget();
if (otherTarget->kit()->id() != kitId)
if (!otherTarget || otherTarget->kit()->id() != kitId)
continue;
foreach (BuildConfiguration *otherBc, otherTarget->buildConfigurations()) {
@@ -355,7 +355,7 @@ void SessionManager::setActiveDeployConfiguration(Target *target, DeployConfigur
if (otherProject == target->project())
continue;
Target *otherTarget = otherProject->activeTarget();
if (otherTarget->kit()->id() != kitId)
if (!otherTarget || otherTarget->kit()->id() != kitId)
continue;
foreach (DeployConfiguration *otherDc, otherTarget->deployConfigurations()) {