diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 10:19:52 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-02-05 11:59:35 +0100 |
commit | 5c121d57911d91f19b066803ad38ca4815255dde (patch) | |
tree | 728e9206d48968ccbc72dafcd284da4c47b2a9e7 /src/plugins/genericprojectmanager | |
parent | aeb7ef6b37030ed4beb8f431167d2ef88172486b (diff) | |
parent | b2ddeacfb5c54d3b0e15c8e6087d21aefaed4d7a (diff) |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 92470f46177..5c93e8691a3 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -587,10 +587,12 @@ void GenericBuildSystem::updateDeploymentData() hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString()); } if (hasDeploymentData) { - DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); - setDeploymentData(deploymentData); + if (target) { + DeploymentData deploymentData; + deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), + projectDirectory().toString()); + setDeploymentData(deploymentData); + } if (m_deployFileWatcher.files() != QStringList(deploymentFilePath.toString())) { m_deployFileWatcher.removeFiles(m_deployFileWatcher.files()); m_deployFileWatcher.addFile(deploymentFilePath.toString(), |