diff options
| author | axis <qt-info@nokia.com> | 2010-11-08 15:13:54 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-11-09 09:47:53 (GMT) |
| commit | 793d1ac6dc6faf1485317d4c8a7f9026468374b3 (patch) | |
| tree | 17bc3f7c361862f3d1c1182d89390a9a114151f1 /mkspecs | |
| parent | 8336bbe157618eb062a647d1685e3b4c440b7ec7 (diff) | |
| download | Qt-793d1ac6dc6faf1485317d4c8a7f9026468374b3.zip Qt-793d1ac6dc6faf1485317d4c8a7f9026468374b3.tar.gz Qt-793d1ac6dc6faf1485317d4c8a7f9026468374b3.tar.bz2 | |
Fixed deployment for symbian/linux-armcc when using shadow builds.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/application_icon.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/symbian/default_post.prf | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index f43ec3d..0fe6305 100644 --- a/mkspecs/features/symbian/application_icon.prf +++ b/mkspecs/features/symbian/application_icon.prf @@ -15,10 +15,12 @@ contains(CONFIG, no_icon) { resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR } else { - isEmpty(DESTDIR) { - resourceZDir = . - } else { + contains(DESTDIR, "/.*") { resourceZDir = $$DESTDIR + } else:isEmpty(DESTDIR) { + resourceZDir = $$OUT_PWD + } else { + resourceZDir = $$OUT_PWD/$$DESTDIR } regZDir = $$resourceZDir } diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index fe1f6d3..22e3c82 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -8,8 +8,14 @@ contains(TEMPLATE, ".*app") { } else { QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY } - - default_bin_deployment.files += $$symbianRemoveSpecialCharacters($$basename(TARGET)).exe + + contains(DESTDIR, "/.*") { + default_bin_deployment.sources += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe + } else:isEmpty(DESTDIR) { + default_bin_deployment.sources += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe + } else { + default_bin_deployment.sources += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe + } default_bin_deployment.path += /sys/bin load(application_icon.prf) |