From e4ebad5eafdf81a4aab40258a7b098495cf66d53 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Fri, 15 Nov 2013 14:24:47 +0100
Subject: [PATCH] Don't overwrite deployment options for non-iOS unix-platforms
A missing else was causing the else:unix-branch of the ios condition
to always execute for unix platforms, overwriting any of the
settings from before. Result was e.g. that Android builds would
not properly install their assets.
Change-Id: Icf8d2e77ff7eaea478cc2f945d3aee7929cc4078
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
share/qtcreator/templates/shared/deployment.pri | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri
index 63dc0f39239..6376a8284a4 100644
--- a/share/qtcreator/templates/shared/deployment.pri
+++ b/share/qtcreator/templates/shared/deployment.pri
@@ -89,7 +89,7 @@ android-no-sdk {
export(copydeploymentfolders.commands)
QMAKE_EXTRA_TARGETS += first copydeploymentfolders
}
-} ios {
+} else:ios {
copyCommand =
for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
--
GitLab