summaryrefslogtreecommitdiffstats
path: root/doc/src/s60-introduction.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/s60-introduction.qdoc')
-rw-r--r--doc/src/s60-introduction.qdoc74
1 files changed, 53 insertions, 21 deletions
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/s60-introduction.qdoc
index 24f7817..53ad562 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/s60-introduction.qdoc
@@ -9,8 +9,8 @@
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,20 +21,20 @@
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
** package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -90,6 +90,7 @@
\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 sisx \o Create signed \c .sis file for project.
\endtable
The following lines perform a debug build for the emulator
@@ -102,16 +103,47 @@
\section1 Installing your own applications
- To install your own applications on hardware, Qt comes with a tool called
- \c createpackage. When used on the \c .pkg files created by qmake, it
- will produce a signed \c .sis file that can be installed to the device. For
- example:
-
+ To install your own applications on hardware, you need signed \c .sis file.
+ The signed \c .sis file can be created with \c make \c sisx target. \c sisx target
+ is only supported for executables or projects with \c DEPLOYMENT statements.
+ By default the \c sisx target will create signed \.sis file for last build
+ target. For example, the following sequence will generate the needed makefiles,
+ build the project for \c debug-winscw and \c release-armv5, and create
+ self-signed \c .sis file for \c release-armv5 target:
+
\snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 2
+ If you want to use different certificate information or override the default
+ target for \c .sis file creation you can use the environment variables as
+ shown in the table below:
+
+ \table
+ \row \o \c QT_SISX_OPTIONS \o Options accepted by \c .sis creation.
+ Currently only -i, install the package right away
+ using PC suite, is supported.
+ By default no otions are given.
+ \row \o \c QT_SISX_TARGET \o Target for which \c .sis file is created.
+ Accepted values are build targets listed in
+ previous table. By default last build target.
+ \row \o \c QT_SISX_CERTIFICATE \o The certificate file used for signing.
+ By default self-signed certificate.
+ \row \o \c QT_SISX_KEY \o The certificate's private key file.
+ By default key is associated to self-signed certificate.
+ \row \o \c QT_SISX_PASSPHRASE \o The certificate's private key file's passphrase.
+ By default empty.
+ \endtable
+
+ The environment variables for \c make can be given as an parameters. For example:
+
+ \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3
+
+ The above example is identical to:
+
+ \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 4
+
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 createpackage
- with the \c -i switch, like this:
+ is connected to the computer in "PC Suite" mode, and run \c sisx target
+ with the \c QT_SISX_OPTIONS=-i, like this:
- \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 3
+ \snippet doc/src/snippets/code/doc_src_s60-introduction.qdoc 5
*/