diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
commit | 1c20abaaeef1ab448526e5821db06350537c1333 (patch) | |
tree | 554a714b3b3b39807e046faeb612a67401c4b219 /mkspecs/features/symbian | |
parent | a653056f806a3410b4aa76df78fae736d4f93791 (diff) | |
parent | 787b56fbcad2eda8ababc919a535fb2f9ef48fb5 (diff) | |
download | Qt-1c20abaaeef1ab448526e5821db06350537c1333.zip Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.gz Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show EditorDateEdit before changing selection in qdatetimeedit test
Moved runonphone target to prf files for all build systems.
Incorrectly named keys in QS60StyleEnums::SkinParts
Fix recursive targets for src.pro
Fix recursive 'make sis' for symbian builds
Fixed destdir not being defined.
Enable runonphone target for libraries as well.
Diffstat (limited to 'mkspecs/features/symbian')
-rw-r--r-- | mkspecs/features/symbian/run_on_phone.prf | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf index c4c7baf..6948a48 100644 --- a/mkspecs/features/symbian/run_on_phone.prf +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -1,9 +1,31 @@ # make sure we have a sis file and then call 'runonphone' to execute it on the phone -contains(TEMPLATE, app) { - run_target.target = runonphone - run_target.depends = sis - run_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" "$${TARGET}.exe" $(QT_RUN_OPTIONS) +GENERATE_RUN_TARGETS = false - QMAKE_EXTRA_TARGETS += run_target +contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true +else:!equals(DEPLOYMENT, default_deployment) { + for(dep_item, $$list($$DEPLOYMENT)) { + dep_item_sources = $$eval($${dep_item}.sources) + !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true + } +} + +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, "/", "\\") + + contains(SYMBIAN_PLATFORMS, "WINSCW"):contains(TEMPLATE, "app") { + run_target.target = run + run_target.commands = call "$${EPOCROOT}epoc32/release/winscw/udeb/$${TARGET}.exe" $(QT_RUN_OPTIONS) + + QMAKE_EXTRA_TARGETS += run_target + } + + runonphone_target.target = runonphone + runonphone_target.depends = sis + runonphone_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" + contains(TEMPLATE, "app"):runonphone_target.commands += "$${TARGET}.exe" $(QT_RUN_OPTIONS) + + QMAKE_EXTRA_TARGETS += runonphone_target } |