diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-01-05 10:15:00 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-11 12:57:52 (GMT) |
commit | d7881141477171c159457cc45fa448a0190230ea (patch) | |
tree | 36e80214eff08c65be1dc84f7dbdbc61c5eb8f57 | |
parent | fb79b80fbd50289018ea9eced55dc865179679cb (diff) | |
download | Qt-d7881141477171c159457cc45fa448a0190230ea.zip Qt-d7881141477171c159457cc45fa448a0190230ea.tar.gz Qt-d7881141477171c159457cc45fa448a0190230ea.tar.bz2 |
Fixed "run" makefile target documentation for Symbian
"run" target no longer is just for running emulator targets.
Also added TRK for optional requirements.
Reviewed-by: axis
(cherry picked from commit 1ae7c8d8f549cadda4780835d85235085cc5583c)
-rw-r--r-- | doc/src/getting-started/installation.qdoc | 9 | ||||
-rw-r--r-- | doc/src/platforms/symbian-introduction.qdoc | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 911a379..9abe066 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -1031,6 +1031,15 @@ If you are using pre-built binaries, follow the instructions given in the \o \c{nokia_plugin\opencpp\s60opencppsis\stdcpp_s60_<version>.sis} \endlist + If you wish to do hardware debugging with Carbide or run applications in real devices using "make run" command, + TRK must be installed to the device. \bold{Note:} TRK is not required if you just want to install and run + applications manually on the device. + \list + \o \l{http://tools.ext.nokia.com/trk/}{Application TRK}. Choose the correct + installation package based on the S60 version of your device (S60_<S60-version>_app_trk_<TRK-version>.sisx). + \endlist + + We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start} to get more information about how to setup the development environment. diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc index 9b76f58..8423d1b 100644 --- a/doc/src/platforms/symbian-introduction.qdoc +++ b/doc/src/platforms/symbian-introduction.qdoc @@ -124,7 +124,12 @@ \row \o \c release-gcce \o Build release binaries for hardware using GCCE. \row \o \c debug-armv5 \o Build debug binaries for hardware using RVCT. \row \o \c release-armv5 \o Build release binaries for hardware using RVCT. - \row \o \c run \o Run the emulator binaries from the build directory. + \row \o \c run \o Run the application. Environment variable + \c QT_SIS_TARGET (see below) can be used to specify which + build target is run. By default it is the last build target. + Note that running the application on real device + using this command requires \c TRK application to be running + on the device. \row \o \c sis \o Create signed \c .sis file for project. \endtable |