diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-10-07 09:41:03 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-10-21 09:12:21 (GMT) |
| commit | 05f11382495187ee3c140503794fe263dc1612fd (patch) | |
| tree | 27fe02fff12d54afac4f4ba0a355c7ae282acc5c /src/s60main | |
| parent | ac439ba6a12b2d5029783d73e1c879db7dc269a5 (diff) | |
| download | Qt-05f11382495187ee3c140503794fe263dc1612fd.zip Qt-05f11382495187ee3c140503794fe263dc1612fd.tar.gz Qt-05f11382495187ee3c140503794fe263dc1612fd.tar.bz2 | |
Removed the need for S60main.rsc resource file in Symbian.
Qt upgrade was failing since the s60main.rsc is being locked by
S60 application framework. And when installer detects that
old version of Qt has already been installed it first tries to
uninstall the old one and then install the new one. The uninstallion
failed since the file was locked by the running Qt application.
It should be noted that this patch fixes the Qt upgradibility only
for Qt versions where patch is included. I.e. the versions before
4.7.2 need a different mechanism to be upgradable. This different
mechanism is based on partial upgrade SIS packages as described in
QT-4052.
Task-number: QT-3471
Reviewed-by: Axis
Diffstat (limited to 'src/s60main')
| -rw-r--r-- | src/s60main/s60main.rsg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/s60main/s60main.rsg b/src/s60main/s60main.rsg deleted file mode 100644 index 8cdf3ba..0000000 --- a/src/s60main/s60main.rsg +++ /dev/null @@ -1,3 +0,0 @@ -#define R_DEFAULT_DOCUMENT_NAME 0x55567002 -#define R_QT_WRAPPERAPP_MENUBAR 0x55567004 -#define R_QT_WRAPPERAPP_MENU 0x55567005 |