summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-03-15 10:02:20 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-03-15 12:25:02 (GMT)
commit8731cb8b852eaa638a64c8a6301ba577f2b735ac (patch)
tree36795ccde6c8d93e30a29459fd5abe4269f9e796
parenteed987453272d925a41d6e8249bdf3458609a58a (diff)
downloadQt-8731cb8b852eaa638a64c8a6301ba577f2b735ac.zip
Qt-8731cb8b852eaa638a64c8a6301ba577f2b735ac.tar.gz
Qt-8731cb8b852eaa638a64c8a6301ba577f2b735ac.tar.bz2
Removed broken "deploy.path" support from Symbian
The undocumented special "deploy.path" variable hasn't been working in Symbian for several releases and doesn't really make much sense in Symbian in the first place. Also, apparently no-one has ever used it as there has been no bug reports, so might as well remove the check for it in Symbian. Task-number: QTBUG-14426 Reviewed-by: Janne Koskinen
-rw-r--r--qmake/generators/symbian/initprojectdeploy_symbian.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index f9fae9d..f70c49d 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -169,9 +169,7 @@ void initProjectDeploySymbian(QMakeProject* project,
QStringList& generatedDirs,
QStringList& generatedFiles)
{
- QString targetPath = project->values("deploy.path").join(" ");
- if (targetPath.isEmpty())
- targetPath = testPath;
+ QString targetPath = testPath;
if (targetPath.endsWith("/") || targetPath.endsWith("\\"))
targetPath = targetPath.mid(0, targetPath.size() - 1);