diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-16 13:49:53 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-16 14:14:37 (GMT) |
| commit | 1163032eda2dce89bd464d2a99f3cbbcf20cc232 (patch) | |
| tree | f6ad0d737b2339318defd309d5fcf898590a3668 | |
| parent | 5f99c63ab340da353497bfe4d74827b179d8a654 (diff) | |
| download | Qt-1163032eda2dce89bd464d2a99f3cbbcf20cc232.zip Qt-1163032eda2dce89bd464d2a99f3cbbcf20cc232.tar.gz Qt-1163032eda2dce89bd464d2a99f3cbbcf20cc232.tar.bz2 | |
Fix emulator deployment for items with "!:" drive.
"!:" drive is used to indicate need to prompt user to specify
installation drive, which is obviously not happening when we do the
build time emulator deployment, so default it to "c:" drive.
Task-number: QTBUG-18134
Reviewed-by: Janne Koskinen
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index f70c49d..8d04a42 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -223,7 +223,10 @@ void initProjectDeploySymbian(QMakeProject* project, } else { if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))) { if (devicePathHasDriveLetter) { - devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1); + 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; } |