diff options
author | hjk <hjk@qt.io> | 2020-02-05 12:32:44 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-05 13:30:10 +0000 |
commit | 4ad4871fdc8dccf3aeecc4b55c57cb1468667d48 (patch) | |
tree | 773819e3b89ea7596fd643d7b4a4e2ebe3bf2327 /src/plugins/genericprojectmanager | |
parent | ea6da69e8b210aee63b79e0041dae948eab546fe (diff) |
GenericProject: Use own target instead of activeTarget()
... when updating deployment data.
Change-Id: Ifa18d4f4fce2fddba91989e2c3094299d4d1f0ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/genericprojectmanager')
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 5c93e8691a..f64327c30e 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -576,23 +576,20 @@ void GenericBuildSystem::updateDeploymentData() { static const QString fileName("QtCreatorDeployment.txt"); Utils::FilePath deploymentFilePath; - Target *target = project()->activeTarget(); - if (target && target->activeBuildConfiguration()) { - deploymentFilePath = target->activeBuildConfiguration()->buildDirectory() - .pathAppended(fileName); - } + BuildConfiguration *bc = target()->activeBuildConfiguration(); + if (bc) + deploymentFilePath = bc->buildDirectory().pathAppended(fileName); + bool hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString()); if (!hasDeploymentData) { deploymentFilePath = projectDirectory().pathAppended(fileName); hasDeploymentData = QFileInfo::exists(deploymentFilePath.toString()); } if (hasDeploymentData) { - if (target) { - DeploymentData deploymentData; - deploymentData.addFilesFromDeploymentFile(deploymentFilePath.toString(), - projectDirectory().toString()); - setDeploymentData(deploymentData); - } + 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(), |