diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 15:42:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 15:42:07 (GMT) |
| commit | 881b3bf8212432590d19e2a979577c2a9f3ab80b (patch) | |
| tree | bd85279cf99b96b026e44d3cf1bff5a5e1994fc2 /src | |
| parent | 68f38d73d3565a6e59fd60ba61584ebd0b187129 (diff) | |
| parent | 434ce6748ea7f082357b6d7ab542c9fa2285bd4c (diff) | |
| download | Qt-881b3bf8212432590d19e2a979577c2a9f3ab80b.zip Qt-881b3bf8212432590d19e2a979577c2a9f3ab80b.tar.gz Qt-881b3bf8212432590d19e2a979577c2a9f3ab80b.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 "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')
| -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 |