Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed deployment for symbian/linux-armcc when using shadow builds.
  Started using qtmain.lib for all Qt applications, also corelib ones.
  Make qmake to pass all UTF-8 characters unchanged through parser.
  Implement support for DEPLOYMENT.display_name in Symbian
  Added .flags modifier support for DEPLOYMENT items in Symbian
  Make default application deployment removable
  Allow pkg_prerules and pkg_postrules to be targeted to separate files
  Added missing def file symbol.
  Revert "Use qtmain.lib to provide entry point for all Symbian applications"
  Fixed test after the fix to QT-4077.
  Fixed event starvation with pointer events on Symbian.

2 files changed, 85 insertions, 6 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d65967d..6531d25 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1394,12 +1394,16 @@
     On the Symbian platform, generic PKG file content can also be specified with this
     variable. You can use either \c pkg_prerules or \c pkg_postrules to 
     pass raw data to PKG file. The strings in \c pkg_prerules are added before
-    package-body and \c pkg_postrules after. The strings defined in 
-    \c pkg_postrules or \c pkg_prerules are not parsed by qmake, so they 
-    should be in a format understood by Symbian package generation tools. 
+    package-body and \c pkg_postrules after. \c pkg_prerules is used for
+    defining vendor information, dependencies, custom package headers, and the
+    like, while \c pkg_postrules is used for custom file deployment and
+    embedded sis directives.
+    The strings defined in \c pkg_postrules or \c pkg_prerules are not parsed
+    by qmake, so they should be in a format understood by Symbian package
+    generation tools.
     Please consult the Symbian platform documentation for correct syntax.
 
-    For example, to deploy DLL and add a new dependency: 
+    For example, to deploy DLL and add a new dependency:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 140
 
@@ -1415,13 +1419,28 @@
     \o localized and unique vendor, for example \BR
         %{"Vendor-EN", ..., "Vendor-FR"}
         :"Unique vendor name"
-    \endlist    
+    \endlist
 
-    If you decide to override any of these statements, you need to pay 
+    If you decide to override any of these statements, you need to pay
     attention that also other statements stay valid. For example if you
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
 
+    On the Symbian platform, three separate PKG files are generated:
+
+    \list
+    \o <app>_template.pkg - For application SIS file. Rules suffix: \c{.main}
+    \o <app>_installer.pkg - For smart installer SIS file. Rules suffix: \c{.installer}
+    \o <app>_stub.pkg - For ROM stubs. Rules suffix: \c{.stub}
+    \endlist
+
+    \c pkg_prerules and \c pkg_postrules given without rules suffix will
+    intelligently apply to each of these files, but rules can also be
+    targeted to only one of above files by appending listed rules suffix
+    to the variable name:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 153
+
     On the Symbian platform, the \c default_deployment item specifies
     default platform and package dependencies. Those dependencies can be
     selectively disabled if alternative dependencies need to be defined
@@ -1439,6 +1458,46 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141
 
+    On the Symbian platform, a default deployment is generated for all
+    application projects. You can modify the autogenerated default
+    deployment via following \c DEPLOYMENT variable values:
+
+    \list
+    \o default_bin_deployment - Application executable
+    \o default_resource_deployment - Application resources, including icon
+    \o default_reg_deployment - Application registration file
+    \endlist
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 154
+
+    This will entirely remove the default application deployment.
+
+    On the Symbian platform, you can specify file specific install options
+    with \c{.flags} modifier. Please consult the Symbian platform documentation
+    for supported options.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 155
+
+    This will show a message box that gives user an option to cancel the
+    installation and then automatically runs the application after
+    installation is complete.
+
+    \note Automatically running the applications after install may require signing
+    the package with better than self-signed certificate, depending on the phone model.
+    Additionally, some tools such as Runonphone may not work properly with sis
+    packages that automatically run the application upon install.
+
+    On the Symbian platform, the default package name and the default name that
+    appears in application menu is derived from the \c TARGET variable.
+    Often the default is not optimal for displaying to end user. To set a better
+    display name for these purposes, use \c{DEPLOYMENT.display_name} variable:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 156
+
     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
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 8c35c3f..4f74e9c 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1009,3 +1009,23 @@ my_exports = \
     "bar.h /epoc32/include/mylib/bar.h"
 BLD_INF_RULES.prj_exports += my_exports
 //! [152]
+
+//! [153]
+my_note.pkg_postrules.installer = "\"myinstallnote.txt\" - \"\", FILETEXT, TEXTCONTINUE"
+DEPLOYMENT += my_note
+//! [153]
+
+//! [154]
+DEPLOYMENT -= default_bin_deployment default_resource_deployment default_reg_deployment
+//! [154]
+
+//! [155]
+default_bin_deployment.flags += FILERUN RUNINSTALL
+dep_note.sources = install_note.txt
+dep_note.flags = FILETEXT TEXTEXIT
+DEPLOYMENT += dep_note
+//! [155]
+
+//! [156]
+DEPLOYMENT.display_name = My Qt App
+//! [156]