summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-07-13 07:42:39 (GMT)
committeraxis <qt-info@nokia.com>2009-07-13 07:45:13 (GMT)
commit5bd2444e86a90494c453e36bc7a4bb35654e7fa0 (patch)
tree597f9e3060ed2552e9f7fde90924fed356218392 /qmake/generators
parenta4878eda8852cfe2306b2c21bb64b399b8f3b3d8 (diff)
downloadQt-5bd2444e86a90494c453e36bc7a4bb35654e7fa0.zip
Qt-5bd2444e86a90494c453e36bc7a4bb35654e7fa0.tar.gz
Qt-5bd2444e86a90494c453e36bc7a4bb35654e7fa0.tar.bz2
Made deployment paths with drive letters work.
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/symbian/initprojectdeploy_symbian.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 0325264..22e4aad 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -148,7 +148,11 @@ void initProjectDeploySymbian(QMakeProject* project,
devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('\\') + devicePath));
} else {
if (0 == platform.compare(QLatin1String("winscw"))) {
- devicePath = epocRoot() + "epoc32\\winscw\\c" + devicePath;
+ if (devicePathHasDriveLetter) {
+ devicePath = epocRoot() + "epoc32\\winscw\\" + devicePath.remove(1,1);
+ } else {
+ devicePath = epocRoot() + "epoc32\\winscw\\c" + devicePath;
+ }
} else {
// Drive letter needed if targetpath contains one and it is not already in
if (targetPathHasDriveLetter && !devicePathHasDriveLetter) {