diff options
| author | axis <qt-info@nokia.com> | 2010-11-08 15:13:54 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-11-08 15:30:29 (GMT) |
| commit | 1dab1be81c2f295736f196a9d56ce4facb59fe64 (patch) | |
| tree | 88b1e1ab13aee845f4f77408c6e333b77c3e4fa0 /mkspecs | |
| parent | 5657b8f13bd6ef456a1da7ae08a2924e256b8ea3 (diff) | |
| download | Qt-1dab1be81c2f295736f196a9d56ce4facb59fe64.zip Qt-1dab1be81c2f295736f196a9d56ce4facb59fe64.tar.gz Qt-1dab1be81c2f295736f196a9d56ce4facb59fe64.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 | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf index 39f10fb..6e1aa8e 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 b62bf98..d9ff03d 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -9,7 +9,13 @@ contains(TEMPLATE, ".*app") { QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY } - default_bin_deployment.sources += $$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) |