diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 14:50:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-26 14:50:06 (GMT) |
| commit | 282d2a2aef76d13f5c493e77907c5122ab54f3af (patch) | |
| tree | fe3e0afd119882cb3a267a821185eb91a4aa7b36 /demos/symbianpkgrules.pri | |
| parent | 74c9e76e0c53e60ad340bb002c4efa6ecd57cd58 (diff) | |
| parent | 00ab5c0d690f5cbb1f588adf0d469e5e9c54051c (diff) | |
| download | Qt-282d2a2aef76d13f5c493e77907c5122ab54f3af.zip Qt-282d2a2aef76d13f5c493e77907c5122ab54f3af.tar.gz Qt-282d2a2aef76d13f5c493e77907c5122ab54f3af.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:
Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidget
Create dummy window surface if if _q_DummyWindowSurface property is set
Remove widget subtree from backing store tracker when reparented
Suppress call to controlVisibilityChanged for null control pointer
Fix patch_capabilities.pl script for explicit set of capabilities
Fix empty mifconv TARGETFILE in some edge cases.
Diffstat (limited to 'demos/symbianpkgrules.pri')
| -rw-r--r-- | demos/symbianpkgrules.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri index d42f188..c9cc492 100644 --- a/demos/symbianpkgrules.pri +++ b/demos/symbianpkgrules.pri @@ -13,4 +13,6 @@ vendorinfo = \ demos_deployment.pkg_prerules += vendorinfo DEPLOYMENT += demos_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 +} |