diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-26 09:03:32 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-26 09:27:03 (GMT) |
| commit | 86870912cfb1444f2ad0cd6b99c163af43f06bde (patch) | |
| tree | 62581a4166565be7103d70fbe5d25f0d8430445e | |
| parent | a721eb2fc6f0b95bb95b508baf60798ca60b1172 (diff) | |
| download | Qt-86870912cfb1444f2ad0cd6b99c163af43f06bde.zip Qt-86870912cfb1444f2ad0cd6b99c163af43f06bde.tar.gz Qt-86870912cfb1444f2ad0cd6b99c163af43f06bde.tar.bz2 | |
Fix empty mifconv TARGETFILE in some edge cases.
Only add ICON for Qt gui application projects that do not explicitly
want to suppress it in symbianpkgrules.pri. This logic should match
the logic used for setting RSS_RULES.icon_file and thus avoid
empty TARGETFILE in bld.inf mifconv extension.
Task-number: QT-4193
Reviewed-by: Janne Koskinen
| -rw-r--r-- | demos/symbianpkgrules.pri | 4 | ||||
| -rw-r--r-- | examples/symbianpkgrules.pri | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri index d42f188..c9cc492 100644 --- a/demos/symbianpkgrules.pri +++ b/demos/symbianpkgrules.pri @@ -13,4 +13,6 @@ vendorinfo = \ demos_deployment.pkg_prerules += vendorinfo DEPLOYMENT += demos_deployment -contains(TEMPLATE,app):isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { + ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +} diff --git a/examples/symbianpkgrules.pri b/examples/symbianpkgrules.pri index b22ca85..0f615c7 100644 --- a/examples/symbianpkgrules.pri +++ b/examples/symbianpkgrules.pri @@ -13,4 +13,7 @@ vendorinfo = \ examples_deployment.pkg_prerules += vendorinfo DEPLOYMENT += examples_deployment -contains(TEMPLATE,app):isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { + ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +} + |