diff options
| author | axis <qt-info@nokia.com> | 2010-06-24 13:15:28 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-24 13:27:15 (GMT) |
| commit | 415eab3eab1a037badec279dbfd41278f0f92719 (patch) | |
| tree | c4626cf03464a3b4427fc2f979104b418a5c287e | |
| parent | 5b5ae51b22b57897dd61b9f8910e510757fa59c5 (diff) | |
| download | Qt-415eab3eab1a037badec279dbfd41278f0f92719.zip Qt-415eab3eab1a037badec279dbfd41278f0f92719.tar.gz Qt-415eab3eab1a037badec279dbfd41278f0f92719.tar.bz2 | |
Fixed make runonphone that looked for the package in the wrong place.
Task: QTBUG-11670
RevBy: Trust me
| -rw-r--r-- | mkspecs/features/symbian/run_on_phone.prf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index 6948a48..818151a 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -11,9 +11,13 @@ else:!equals(DEPLOYMENT, default_deployment) { } equals(GENERATE_RUN_TARGETS, true) { - sis_destdir = $$DESTDIR - !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ - contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") + symbian-abld|symbian-sbsv2 { + sis_destdir = + } else { + sis_destdir = $$DESTDIR + !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/ + contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\") + } contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") { run_target.target = run |