diff options
author | Shane Kearns <shane.kearns@sosco.com> | 2009-09-21 15:04:19 (GMT) |
---|---|---|
committer | Shane Kearns <shane.kearns@sosco.com> | 2009-09-22 07:14:09 (GMT) |
commit | eda6cd89b57b433847662f96ab21876d97f9eb60 (patch) | |
tree | 9c5833e68f91cc0409233c6f52b3b1984eea2734 /qmake/generators | |
parent | 835a8e53d93f71fee0c73c3e02f73a4a01215d60 (diff) | |
download | Qt-eda6cd89b57b433847662f96ab21876d97f9eb60.zip Qt-eda6cd89b57b433847662f96ab21876d97f9eb60.tar.gz Qt-eda6cd89b57b433847662f96ab21876d97f9eb60.tar.bz2 |
Fix qmake pkg file generator to respect a drive specified for binaries
The target path for binaries (.path configuration) in the DEPLOYMENT
section of a .pro file now works for binaries as well as for resources.
Path on device is still forced to /sys/bin
Default path is still !:/sys/bin
This can be used to force a binary to be installed on system drive by
setting the path to "c:/sys/bin" or "$:/sys/bin" (for S60 3.2+)
Reviewed-by: Iain
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index abff955..f27d1ba 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -331,8 +331,13 @@ void initProjectDeploySymbian(QMakeProject* project, if (deployBinaries) { // Executables and libraries are deployed to \sys\bin QFileInfo releasePath(epocRoot() + "epoc32\\release\\" + platform + "\\" + build + "\\"); - deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true), - Option::fixPathToLocalOS(deploymentDrive + QLatin1String(SYSBIN_DIR "\\") + info.fileName()))); + if(devicePathHasDriveLetter) { + deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true), + Option::fixPathToLocalOS(devicePath.left(2) + QLatin1String(SYSBIN_DIR "\\") + info.fileName()))); + } else { + deploymentList.append(CopyItem(Option::fixPathToLocalOS(releasePath.absolutePath() + "\\" + info.fileName(), false, true), + Option::fixPathToLocalOS(deploymentDrive + QLatin1String(SYSBIN_DIR "\\") + info.fileName()))); + } } if (isPlugin(info, devicePath)) { createPluginStub(info, devicePath, deploymentList, generatedDirs, generatedFiles); |