diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 14:43:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 14:43:37 (GMT) |
| commit | c849ddd06371e5a6455c63d67a14171ac06bf9d4 (patch) | |
| tree | 8f837d0f4d820ff705026d3f681d73b3e869011c | |
| parent | 59095bbc545a6abc1723bfb53dbd2118f86d4578 (diff) | |
| parent | a2fcae261dd1a2c676b4d636b4b218461a7f0587 (diff) | |
| download | Qt-c849ddd06371e5a6455c63d67a14171ac06bf9d4.zip Qt-c849ddd06371e5a6455c63d67a14171ac06bf9d4.tar.gz Qt-c849ddd06371e5a6455c63d67a14171ac06bf9d4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Only add ICON for application projects in symbianpkgrules.pri
| -rw-r--r-- | demos/symbianpkgrules.pri | 2 | ||||
| -rw-r--r-- | examples/symbianpkgrules.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri index 68a82cd..d42f188 100644 --- a/demos/symbianpkgrules.pri +++ b/demos/symbianpkgrules.pri @@ -13,4 +13,4 @@ vendorinfo = \ demos_deployment.pkg_prerules += vendorinfo DEPLOYMENT += demos_deployment -isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +contains(TEMPLATE,app):isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg diff --git a/examples/symbianpkgrules.pri b/examples/symbianpkgrules.pri index a1b6634..b22ca85 100644 --- a/examples/symbianpkgrules.pri +++ b/examples/symbianpkgrules.pri @@ -13,4 +13,4 @@ vendorinfo = \ examples_deployment.pkg_prerules += vendorinfo DEPLOYMENT += examples_deployment -isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +contains(TEMPLATE,app):isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg |