diff options
Diffstat (limited to 'qmake/generators/symbian/initprojectdeploy_symbian.cpp')
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 36e5610faf..5d1b2c1a41 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -223,12 +223,21 @@ void initProjectDeploySymbian(QMakeProject* project, } else { if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))) { if (devicePathHasDriveLetter) { - if (devicePath.startsWith("!")) - devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath.remove(0, 2); - else - devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1); + if (devicePath.startsWith("z", Qt::CaseInsensitive)) { + devicePath = qt_epocRoot() + "epoc32/release/winscw/" + build + "/z" + devicePath.remove(0, 2); + } else { + // Do not create deployment for urel target. Otherwise we would be generating two + // identical deployments for paths with drive letter other than Z. + if (0 == build.compare(QLatin1String("urel"), Qt::CaseInsensitive)) + continue; + if (devicePath.startsWith("!")) + devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath.remove(0, 2); + else + devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1); + } } else { - devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath; + // If no device path drive letter, deploy to "emulator ROM drive" + devicePath = qt_epocRoot() + "epoc32/release/winscw/" + build + "/z" + devicePath; } } else { if (devicePathHasDriveLetter |