diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 08:29:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 08:29:02 (GMT) |
| commit | 61d21436d5627dc42506bdb257e107d6a4ffd498 (patch) | |
| tree | 6f78b5c3fda711921a3f164b09e7a2471623b833 /mkspecs | |
| parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
| parent | d64bd955c26af3b204df567245429ddd3f32bcb8 (diff) | |
| download | Qt-61d21436d5627dc42506bdb257e107d6a4ffd498.zip Qt-61d21436d5627dc42506bdb257e107d6a4ffd498.tar.gz Qt-61d21436d5627dc42506bdb257e107d6a4ffd498.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:
Update Symbian DEF files for WINSCW and EABI
Fix spurious mouse click when dismissing a native menu
Add 'runonphone' target for symbian / makefile
Double-click support for virtual cursor in Symbian
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/symbian/run_on_phone.prf | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 2397c96..66b3d7f 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -26,6 +26,7 @@ include(../../common/unix.conf) QMAKE_PREFIX_SHLIB = QMAKE_EXTENSION_SHLIB = dll CONFIG *= no_plugin_name_prefix +CONFIG += run_on_phone QMAKE_EXTENSION_PLUGIN = dll QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf new file mode 100644 index 0000000..c4c7baf --- /dev/null +++ b/mkspecs/features/symbian/run_on_phone.prf @@ -0,0 +1,9 @@ +# 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) + + QMAKE_EXTRA_TARGETS += run_target +} |