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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 4f3e1d2..fbadadc 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -118,7 +118,8 @@ INCLUDEPATH = \ $$INCLUDEPATH # Supports S60 3.0, 3.1, 3.2 and 5.0 by default -default_deployment.depends = \ +default_deployment.pkg_prerules = \ + "; Default HW/platform dependencies" \ "[0x101F7961],0,0,0,{\"S60ProductID\"}" \ "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 29b39a5..db2ea14 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -7,7 +7,8 @@ CONFIG += qtmain load(qt) contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) { - default_deployment.depends += \ + default_deployment.pkg_prerules += \ + "; Default dependency to Qt libraries" \ "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtLibs pre-release\"}" } |