diff options
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 19 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 15 |
2 files changed, 27 insertions, 7 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 36e5610..5d1b2c1 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 diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index ffb386a..d4ccd84 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -687,13 +687,24 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t t << endl; // Write deployment rules - QString remoteTestPath = qt_epocRoot() + QLatin1String("epoc32/winscw/c/private/") + privateDirUid; + QString remoteTestPath = qt_epocRoot() + + QLatin1String("epoc32/release/winscw/udeb/z/private/") + privateDirUid; DeploymentList depList; //write emulator deployment + // There are deployment targets for both uded and urel emulators. t << "#if defined(WINSCW)" << endl; initProjectDeploySymbian(project, depList, remoteTestPath, false, true, - QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QString(), generatedDirs, generatedFiles); + QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QLatin1String(BUILD_DEBUG), + generatedDirs, generatedFiles); + writeSbsDeploymentList(depList, t); + + depList.clear(); + remoteTestPath = qt_epocRoot() + + QLatin1String("epoc32/release/winscw/urel/z/private/") + privateDirUid; + initProjectDeploySymbian(project, depList, remoteTestPath, false, true, + QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM), QLatin1String(BUILD_RELEASE), + generatedDirs, generatedFiles); writeSbsDeploymentList(depList, t); t << "#endif" << endl; |