summaryrefslogtreecommitdiffstats
path: root/demos/symbianpkgrules.pri
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-12-18 10:32:06 (GMT)
committeraxis <qt-info@nokia.com>2009-12-18 10:32:06 (GMT)
commit2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch)
treec274575bb148c9755a901094fc94d4553a84653c /demos/symbianpkgrules.pri
parentab8508380d6e5875ed871196eb09642380ac1aef (diff)
parentbf819a04b0c60c64912f72b613c1546d8be7dc50 (diff)
downloadQt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip
Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz
Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: configure src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'demos/symbianpkgrules.pri')
-rw-r--r--demos/symbianpkgrules.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri
index 7e6852b..c511836 100644
--- a/demos/symbianpkgrules.pri
+++ b/demos/symbianpkgrules.pri
@@ -11,3 +11,5 @@ vendorinfo = \
" "
default_deployment.pkg_prerules += vendorinfo
+
+isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg