diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-29 10:45:22 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-29 10:45:22 +0200 |
| commit | de306893b464ed0fa00f98488912fd6269713519 (patch) | |
| tree | b1ef87ee3e5afa0722c9da87a45e11ff3f620fdc /demos | |
| parent | 4fb6cae4dd0c6a90008780df606abb8a9e73cb2c (diff) | |
| parent | 473da75ed84651c70ae0d10e23f09e1a0e4ae799 (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/symbianpkgrules.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri index c511836b48..68a82cdf61 100644 --- a/demos/symbianpkgrules.pri +++ b/demos/symbianpkgrules.pri @@ -10,6 +10,7 @@ vendorinfo = \ ":\"Nokia, Qt\"" \ " " -default_deployment.pkg_prerules += vendorinfo +demos_deployment.pkg_prerules += vendorinfo +DEPLOYMENT += demos_deployment isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg |