summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-05 10:15:00 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-05 11:19:22 (GMT)
commit1ae7c8d8f549cadda4780835d85235085cc5583c (patch)
treebea70ebe3475e628fa62441bcd95db032e4d6e08 /doc
parent0dc7587b4333ae201b960be01517ad9911fcb3e2 (diff)
downloadQt-1ae7c8d8f549cadda4780835d85235085cc5583c.zip
Qt-1ae7c8d8f549cadda4780835d85235085cc5583c.tar.gz
Qt-1ae7c8d8f549cadda4780835d85235085cc5583c.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
Diffstat (limited to 'doc')
-rw-r--r--doc/src/getting-started/installation.qdoc9
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc7
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 939e2e8..73d3709 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 c0c4fb3..477e629 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