diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 16:07:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 16:07:11 (GMT) |
| commit | 1aba4fde2e407764cafe39520cc52dc9a3b8dd31 (patch) | |
| tree | 80ac962bf6720de4d1f14376401621e3e60eefe5 /examples | |
| parent | 27b07b4794b8773b00f4cab8898ba00c125498cb (diff) | |
| parent | 96beb59dc7fb303debbbf06beb192158ab3476c2 (diff) | |
| download | Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.zip Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.tar.gz Qt-1aba4fde2e407764cafe39520cc52dc9a3b8dd31.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/symbianpkgrules.pri | 5 |
1 files changed, 4 insertions, 1 deletions
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 +} + |