diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 15:22:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 15:22:54 (GMT) |
| commit | 6ddda99db20203917229e399c4b8d333a119c3d6 (patch) | |
| tree | c5293f9229b1f4d9fb4a5a5cf979f38fd54795ce /src/gui | |
| parent | 7e395e4f5a89dd43d1b7b88f12e0fa4107756d54 (diff) | |
| parent | 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f (diff) | |
| download | Qt-6ddda99db20203917229e399c4b8d333a119c3d6.zip Qt-6ddda99db20203917229e399c4b8d333a119c3d6.tar.gz Qt-6ddda99db20203917229e399c4b8d333a119c3d6.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:
Fix QProcessManager destruction
Fix "installer_sis" and "deploy" targets when TARGET has path
Fix for memory leak in qt_init
Fix check to remove unnecessary deployments in Symbian
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index e64ebb1..559bb6a 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1475,6 +1475,8 @@ void qt_init(QApplicationPrivate * /* priv */, int) S60->avkonComponentsSupportTransparency = (value==1) ? true : false; } } + delete repository; + repository = 0; #endif #ifdef QT_KEYPAD_NAVIGATION |