diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
| commit | f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch) | |
| tree | 65f3b637a19ff47fcc97e3f22deeae7d843cad17 /qmake/generators/symbian/initprojectdeploy_symbian.cpp | |
| parent | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'qmake/generators/symbian/initprojectdeploy_symbian.cpp')
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 81c9408..6407412 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -155,6 +155,7 @@ void initProjectDeploySymbian(QMakeProject* project, DeploymentList &deploymentList, const QString &testPath, bool deployBinaries, + bool epocBuild, const QString &platform, const QString &build, QStringList& generatedDirs, @@ -264,7 +265,11 @@ void initProjectDeploySymbian(QMakeProject* project, if (isBinary(info)) { if (deployBinaries) { // Executables and libraries are deployed to \sys\bin - QFileInfo targetPath(epocRoot() + "epoc32/release/" + platform + "/" + build + "/"); + QFileInfo targetPath; + if (epocBuild) + targetPath.setFile(epocRoot() + "epoc32/release/" + platform + "/" + build + "/"); + else + targetPath.setFile(info.path() + QDir::separator()); if(devicePathHasDriveLetter) { deploymentList.append(CopyItem( Option::fixPathToLocalOS(targetPath.absolutePath() + "/" + info.fileName(), |