summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-30 13:43:22 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-08-30 13:43:22 (GMT)
commita537137fffd72d153a35828228c00567a563e787 (patch)
tree0fba11b5b364a680ac2eec0779d2c68cc818f911 /doc
parent708978d1c18cf938a4e0c29a5a90be5de4e82140 (diff)
downloadQt-a537137fffd72d153a35828228c00567a563e787.zip
Qt-a537137fffd72d153a35828228c00567a563e787.tar.gz
Qt-a537137fffd72d153a35828228c00567a563e787.tar.bz2
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. Task-number: QTBUG-13159 Reviewed-by: axis
Diffstat (limited to 'doc')
-rw-r--r--doc/src/development/qmake-manual.qdoc37
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc5
2 files changed, 33 insertions, 9 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index baa30fc..41081a0 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1385,19 +1385,23 @@ is the application private directory on the drive it is installed to.
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
Please note that \c pkg_prerules can also replace default statements in
pkg file. If no pkg_prerules is defined, qmake makes sure that PKG file
syntax is correct and it contains all mandatory statements such as:
-
+
\list
\o languages, for example \BR
&EN,FR
@@ -1406,13 +1410,28 @@ is the application private directory on the drive it is installed to.
\o localized and unique vendor, for example \BR
%{"Vendor-EN", ..., "Vendor-FR"}
:"Unique vendor name"
- \endlist
-
- If you decide to override any of these statements, you need to pay
+ \endlist
+
+ 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 152
+
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 4ac7d5e..0436130 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -1002,3 +1002,8 @@ symbian {
RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
//! [151]
+
+//! [152]
+my_note.pkg_postrules.installer = "\"myinstallnote.txt\" - \"\", FILETEXT, TEXTCONTINUE"
+DEPLOYMENT += my_note
+//! [152]