summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-07-02 11:20:09 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-07-02 11:42:16 (GMT)
commit6fd1da7a672532c53eb55b3e2467332d28df5943 (patch)
treec1963ae7b99a65b615711b6eaa94eeb147e708b8 /doc
parent65316c0fcf9f0a406fd714622407e2b0e767fe7b (diff)
downloadQt-6fd1da7a672532c53eb55b3e2467332d28df5943.zip
Qt-6fd1da7a672532c53eb55b3e2467332d28df5943.tar.gz
Qt-6fd1da7a672532c53eb55b3e2467332d28df5943.tar.bz2
Support for "deploy" make target in Symbian
Executing "make deploy" will recreate project sis file and deploy it into a device. Task-number: QTBUG-5155 Reviewed-by: axis
Diffstat (limited to 'doc')
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc11
-rw-r--r--doc/src/snippets/code/doc_src_symbian-introduction.qdoc3
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 1b3641d..22d858f 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -112,6 +112,7 @@
\row \o \c release-armv5 \o Build release binaries for hardware using RVCT.
\row \o \c run \o Run the application on the emulator.
\row \o \c runonphone \o Run the application on a device.
+ \row \o \c deploy \o Deploys the project into a device.
\row \o \c sis \o Create signed \c .sis file for project.
\row \o \c unsigned_sis \o Create unsigned \c .sis file for project.
\row \o \c installer_sis \o Create signed \l{Smart Installer}{smart installer}
@@ -172,7 +173,7 @@
By default empty.
\endtable
- The suppported options for \c QT_SIS_OPTIONS:
+ The supported options for \c QT_SIS_OPTIONS:
\target Supported options for QT_SIS_OPTIONS
\table
@@ -186,7 +187,7 @@
\endtable
Execute the \c{createpackage.pl} script without any
- parameters for detailed information about options. By default no otions are given.
+ parameters for detailed information about options. By default no options are given.
For example:
@@ -196,9 +197,9 @@
\snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 3
- If you want to install the program immediately, make sure that the device
- is connected to the computer in "PC Suite" mode, and run \c sis target
- with the \c QT_SIS_OPTIONS=-i, like this:
+ If you want to install the program immediately after creating \c .sis file,
+ make sure that the device is connected to the computer in "PC Suite" mode,
+ and use \c deploy target instead of \c sis target:
\snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 5
diff --git a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc b/doc/src/snippets/code/doc_src_symbian-introduction.qdoc
index 60c69c0..a2ea686 100644
--- a/doc/src/snippets/code/doc_src_symbian-introduction.qdoc
+++ b/doc/src/snippets/code/doc_src_symbian-introduction.qdoc
@@ -63,6 +63,5 @@
//! [4]
//! [5]
- set QT_SIS_OPTIONS=-i
- make sis
+ make deploy
//! [5]