summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-19 14:43:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-19 14:43:37 (GMT)
commitc849ddd06371e5a6455c63d67a14171ac06bf9d4 (patch)
tree8f837d0f4d820ff705026d3f681d73b3e869011c /examples
parent59095bbc545a6abc1723bfb53dbd2118f86d4578 (diff)
parenta2fcae261dd1a2c676b4d636b4b218461a7f0587 (diff)
downloadQt-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
Diffstat (limited to 'examples')
-rw-r--r--examples/symbianpkgrules.pri2
1 files changed, 1 insertions, 1 deletions
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