Merge remote-tracking branch 'origin/4.11'

 Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 92470f4617..5c93e8691a 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(),