Allow pkg_prerules and pkg_postrules to be targeted to separate files

Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.

Also clarified documentation of these variables.

Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: a537137fffd72d153a35828228c00567a563e787

Task-number: QTBUG-15068
Task-number: QTBUG-13159
Reviewed-by: axis

Conflicts:

	doc/src/development/qmake-manual.qdoc
	doc/src/snippets/code/doc_src_qmake-manual.qdoc

2 files changed, 30 insertions, 6 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d65967d..a520838 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
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
index 8c35c3f..379d081 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1009,3 +1009,8 @@ 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]