diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-06-15 10:12:31 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-06-17 06:56:23 +0000 |
| commit | 30e863b676741740502e679bd05aec348955c6ee (patch) | |
| tree | c842128d00862ced830606e059627cca62455ebc | |
| parent | e00536eeea25e0ebbf44cf1af88eb7af916d8337 (diff) | |
Fix crash when project node is not found
Change-Id: I235fecb579023530692742f14474ae5229237c28
Fixes: QTCREATORBUG-22564
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 7994c85b6a..42a3c7d6e0 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -234,15 +234,15 @@ bool AndroidDeployQtStep::init() if (m_useAndroiddeployqt) { const ProjectNode *node = target()->project()->findNodeForBuildKey(rc->buildKey()); + if (!node) + return false; m_apkPath = Utils::FilePath::fromString(node->data(Constants::AndroidApk).toString()); if (!m_apkPath.isEmpty()) { m_manifestName = Utils::FilePath::fromString(node->data(Constants::AndroidManifest).toString()); m_command = AndroidConfigurations::currentConfig().adbToolPath(); AndroidManager::setManifestPath(target(), m_manifestName); } else { - QString jsonFile; - if (node) - jsonFile = node->data(Constants::AndroidDeploySettingsFile).toString(); + QString jsonFile = node->data(Constants::AndroidDeploySettingsFile).toString(); if (jsonFile.isEmpty()) { emit addOutput(tr("Cannot find the androiddeploy Json file."), OutputFormat::Stderr); return false; |