diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-07-29 05:37:57 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-07-29 05:37:57 (GMT) |
| commit | d050cb9c44d3c185a36f2af8be36ab70ce7a794e (patch) | |
| tree | 5b7a9e3a37c22f7da643114e42531f68ff15f382 /src | |
| parent | 369d1e0999d1fd130777e0f48831734d30d03efa (diff) | |
| download | Qt-d050cb9c44d3c185a36f2af8be36ab70ce7a794e.zip Qt-d050cb9c44d3c185a36f2af8be36ab70ce7a794e.tar.gz Qt-d050cb9c44d3c185a36f2af8be36ab70ce7a794e.tar.bz2 | |
Extended PKG customization possibilities via qmake.
Task: 242139
This commit replaces Symbian specific 'depends' keyword in qmake
DEPLOYMENT variable with two more generic ones. The new keywords
are 'pkg_prerules' and 'pkg_postrules', and they allow developer to
pass raw data to PKG file. The strings in 'pkg_prerules' are added
before PKG file package-body headers and 'pkg_postrules' after them.
Correspondingly as old 'depends' keyword, the new keywords are not
parsed by qmake, so they must be in a format understood by Symbian
package generation tools.
Note that 'pkg_prerules' can also replace default language,
package-header and vendor statements in pkg file. If you decide to
override any of these statements, you need to pay attention that
also other statements stay valid.
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60installs/qt_libs.pro | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro index bd5c67f..a3be711 100644 --- a/src/s60installs/qt_libs.pro +++ b/src/s60installs/qt_libs.pro @@ -37,12 +37,21 @@ symbian: { #ENDIF qtlibraries.path = /sys/bin - qtlibraries.depends = "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}" + + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt Software\"}" \ + "; Unique Vendor name" \ + ":\"Nokia, Qt Software\"" + + qtlibraries.pkg_prerules = vendorinfo + qtlibraries.pkg_prerules += "; Dependencies of Qt libraries" + qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}" contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { - qtlibraries.depends += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}" + qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}" } contains(CONFIG, stl) { - qtlibraries.depends += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}" + qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}" } !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll |