summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-19 13:38:03 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-19 13:54:39 (GMT)
commita2fcae261dd1a2c676b4d636b4b218461a7f0587 (patch)
tree8f837d0f4d820ff705026d3f681d73b3e869011c
parent59095bbc545a6abc1723bfb53dbd2118f86d4578 (diff)
downloadQt-a2fcae261dd1a2c676b4d636b4b218461a7f0587.zip
Qt-a2fcae261dd1a2c676b4d636b4b218461a7f0587.tar.gz
Qt-a2fcae261dd1a2c676b4d636b4b218461a7f0587.tar.bz2
Only add ICON for application projects in symbianpkgrules.pri
Build break is caused on some environments if ICON is defined for non-application projects, as application_icon.prf doesn't get processed for those, resulting in empty TARGETFILE field in bld.inf. Task-number: QT-4193 Reviewed-by: Janne Koskinen
-rw-r--r--demos/symbianpkgrules.pri2
-rw-r--r--examples/symbianpkgrules.pri2
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