diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 12:37:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 12:37:08 (GMT) |
| commit | 0f5cab801787d55f05546e69a80832189af1d582 (patch) | |
| tree | 36795ccde6c8d93e30a29459fd5abe4269f9e796 | |
| parent | 7efbd345342a018bb5625d97fc5199fdf412aa73 (diff) | |
| parent | 8731cb8b852eaa638a64c8a6301ba577f2b735ac (diff) | |
| download | Qt-0f5cab801787d55f05546e69a80832189af1d582.zip Qt-0f5cab801787d55f05546e69a80832189af1d582.tar.gz Qt-0f5cab801787d55f05546e69a80832189af1d582.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Removed broken "deploy.path" support from Symbian
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 4 |
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); |