Merge remote-tracking branch 'origin/3.6' into 4.0

Change-Id: I5c524b61aa558b66e74a9260b59583851530ac36
This commit is contained in:
Eike Ziller
2016-03-08 12:51:42 +01:00
2 changed files with 63 additions and 1 deletions

View File

@@ -594,7 +594,8 @@ void AndroidManifestEditorWidget::postSave()
if (project) {
if (Target *target = project->activeTarget()) {
AndroidQtSupport *androidQtSupport = AndroidManager::androidQtSupport(target);
androidQtSupport->manifestSaved(target);
if (androidQtSupport)
androidQtSupport->manifestSaved(target);
}
}
}