summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-09 13:09:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-09 13:09:34 (GMT)
commitec0f388dfb14712a144d534296b33df7e6a2df7f (patch)
treeab4d6b9da547a6439ae6f434a69ee3f202d328d7 /doc
parent6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff)
parent3b1a0c4877faa9d1d50372f2128c06530ae4b2d4 (diff)
downloadQt-ec0f388dfb14712a144d534296b33df7e6a2df7f.zip
Qt-ec0f388dfb14712a144d534296b33df7e6a2df7f.tar.gz
Qt-ec0f388dfb14712a144d534296b33df7e6a2df7f.tar.bz2
Merge remote branch 'qt/4.6' into qt-master-from-4.6
Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
Diffstat (limited to 'doc')
-rw-r--r--doc/src/deployment/deployment.qdoc34
-rw-r--r--doc/src/development/qmake-manual.qdoc12
-rw-r--r--doc/src/getting-started/installation.qdoc5
-rw-r--r--doc/src/images/qpainter-text.pngbin791 -> 1391 bytes
-rw-r--r--doc/src/snippets/code/doc_src_deployment.qdoc13
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc10
6 files changed, 48 insertions, 26 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 005f066..51383da 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1571,18 +1571,13 @@
By default \c .pkg file generated by \c qmake adds support for all
S60 3rd edition FP1, S60 3rd edition FP2 and S60 5th edition devices.
- As a last step we will embed the \c qt_installer.sis file to the Wiggly
- deployment file:
+ As a last step we will instruct qmake to generate smart installer \c .pkg file by defining
+ the UID of the installation package. The UID needs to be different than the application UID,
+ and should be reserved via normal Symbian mechanisms. You can use a random UID starting with
+ \c 0xE for testing purposes:
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 58
- When \c qt_installer.sis is embedded to the application deployment file, the
- end-user does not need to download and install all dependencies separately.
- The drawback of \c .sis embedding is that the application \c .sis file size becomes
- big. To address these problems Forum Nokia is planning to release a smart installer
- which will take care of downloading and installing the necessary dependencies
- over-the-air. The expected availability of smart installer is 1Q 2010.
-
Now we are ready to compile the application and create the application
deployment file. Run \c qmake to create Symbian specific makefiles, resources (\.rss)
and deployment packaging files (\c .pkg). And do build to create the
@@ -1591,13 +1586,26 @@
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 59
If everything compiled and linked without any errors, we are now ready to create
- an application installation file:
+ an application package (\c wiggly.sis):
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 60
- If all binaries and dependencies were found, we should now have a self-signed
- \c wiggly_release-gcce.sis ready to be installed on a device. For more information
- about creating a \c .sis file and installing it to device see also
+ Now you can create the smart installer package for the application:
+
+ \snippet doc/src/snippets/code/doc_src_deployment.qdoc 61
+
+ If all binaries and dependencies were found, you should now have a self signed
+ \c wiggly_installer.sis ready to be installed on a device. The smart installer
+ contained in the in the installer package will download the necessary dependencies
+ such as Qt libraries to the device.
+
+ \note If you want to have your application properly Symbian Signed for distribution,
+ you will have to properly sign both the application and the application installer packages.
+ Please see
+ \l{http://developer.symbian.org/wiki/index.php/Category:Symbian_Signed}
+ {Symbian Signed wiki} for more information about Symbian Signed.
+
+ For more information about creating a \c .sis file and installing it to device see also
\l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
*/
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 8fc4058..4ba7eba 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1431,6 +1431,18 @@ is the application private directory on the drive it is installed to.
\snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141
+ On the Symbian platform, you can use \c{DEPLOYMENT.installer_header}
+ variable to generate smart installer wrapper for your application.
+ If you specify just UID of the installer package as the value, then
+ installer package name and version will be autogenerated:
+
+ \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146
+
+ If autogenerated values are not suitable, you can also specify the sis
+ header yourself using this variable:
+
+ \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 147
+
\target DEPLOYMENT_PLUGIN
\section1 DEPLOYMENT_PLUGIN
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3088892..638c2da 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1038,8 +1038,9 @@ If you are using pre-built binaries, follow the instructions given in the
\list
\o \bold{Note:} This is not required if you are using pre-built binary package.
\endlist
- \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
- which is not available free of charge.
+ \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} version 2.2 (build 686 or later),
+ which is not available free of charge. Usage of later versions of RVCT, including the 3.x and 4.x series, is not supported
+ in this release.
\endlist
Running Qt on real device requires the Open C to be installed on the device.
diff --git a/doc/src/images/qpainter-text.png b/doc/src/images/qpainter-text.png
index af7821c..e95c965 100644
--- a/doc/src/images/qpainter-text.png
+++ b/doc/src/images/qpainter-text.png
Binary files differ
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc
index 7eb8808..9c00681 100644
--- a/doc/src/snippets/code/doc_src_deployment.qdoc
+++ b/doc/src/snippets/code/doc_src_deployment.qdoc
@@ -475,11 +475,7 @@ default_deployment.pkg_prerules += supported_platforms
//! [57]
//! [58]
-embedded_deployments = \
- "; Embed Qt dependencies" \
- "@\"$$[QT_INSTALL_PREFIX]/qt_installer.sis\",(0x2001E62D)"
-
-default_deployment.pkg_prerules += embedded_deployments
+DEPLOYMENT.installer_header = 0xE2345678
//! [58]
//! [59]
@@ -489,4 +485,9 @@ make release-gcce
//! [60]
make sis
-//! [60] \ No newline at end of file
+ren wiggly_release-gcce.sis wiggly.sis
+//! [60]
+
+//! [61]
+createpackage wiggly_installer.pkg
+//! [61] \ No newline at end of file
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index b1cbc72..a48b53f 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -963,9 +963,9 @@ RSS_RULES += myrssrules
//! [145]
//! [146]
-BLD_INF_RULES.prj_exports += \
- "$${LITERAL_HASH}include <platform_paths.hrh>" \
- "rom/my.iby APP_LAYER_PUBLIC_EXPORT_PATH(my.iby)" \
- "inc/myheader.h mycomp/myheader.h" \
- ":zip my_api.zip my_api"
+DEPLOYMENT.installer_header = 0x12345678
//! [146]
+
+//! [147]
+DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
+//! [147]