diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-05 14:24:23 +0200 |
| commit | f3a61e8bf7f5b8275c000a0cac70b561422d2230 (patch) | |
| tree | 0cf0631a5b53fdab930f8a7936aff9c9c1c0952f /src/plugins/android/androidglobal.h | |
| parent | 59b34b6b539c78384ea3fc4fd018fe063b4ede53 (diff) | |
| parent | b2ac3fd90ccfc21cf4c5bce353d8e08208961eeb (diff) | |
| download | qt-creator-f3a61e8bf7f5b8275c000a0cac70b561422d2230.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidglobal.h
Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
Diffstat (limited to 'src/plugins/android/androidglobal.h')
| -rw-r--r-- | src/plugins/android/androidglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/android/androidglobal.h b/src/plugins/android/androidglobal.h index 47f147b87d..61c94085fc 100644 --- a/src/plugins/android/androidglobal.h +++ b/src/plugins/android/androidglobal.h @@ -47,6 +47,8 @@ public: template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *dc) { + if (!dc) + return 0; foreach (const Core::Id &id, dc->knownStepLists()) { ProjectExplorer::BuildStepList *bsl = dc->stepList(id); if (!bsl) |