summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-01-21 16:24:50 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2020-01-22 08:59:14 +0000
commitb59785c4b55cc45d01a77d1f67b0f5875a906a05 (patch)
tree91f56e38cbe00d42e4520541ee94fd98f8235a60
parentc16e205a7712cd0f0d8b68cfcaa7baf41acb368f (diff)
downloadqt-creator-b59785c4b55cc45d01a77d1f67b0f5875a906a05.tar.gz
GenericProjectManager: Fix crash updating deployment data
Fixes: QTCREATORBUG-23501 Change-Id: Ia36fe567edf26c293a8db2446d1ee2344b96433e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 1c280eb490..384152b454 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -546,10 +546,12 @@ void GenericProject::updateDeploymentData()
hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString());
}
if (hasDeploymentData) {
- DeploymentData deploymentData;
- deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
- projectDirectory().toString());
- activeTarget()->setDeploymentData(deploymentData);
+ if (activeTarget()) {
+ DeploymentData deploymentData;
+ deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(),
+ projectDirectory().toString());
+ activeTarget()->setDeploymentData(deploymentData);
+ }
if (m_deployFileWatcher->files() != QStringList(deploymentFilePath.toString())) {
m_deployFileWatcher->removeFiles(m_deployFileWatcher->files());
m_deployFileWatcher->addFile(deploymentFilePath.toString(),