Fixed crash in tst_qguiapplication with QT_QPA_PLATFORM=minimal
authorSamuel Rødal <samuel.rodal@digia.com>
Wed, 5 Dec 2012 08:42:16 +0000 (09:42 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Dec 2012 10:35:16 +0000 (11:35 +0100)
The tst_qguiapplication creates and destroys multiple instances of
QGuiApplication. Since the minimal platform plugin doesn't report any
theme names, the platform_theme never gets set to 0 in init_platform,
and we end up trying to use or at least delete an already deleted
QPlatformTheme.

Change-Id: I1a41d55b0705c5531c019e60a7a96dac144bacb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
src/gui/kernel/qguiapplication.cpp

index fb14490..7abda84 100644 (file)
@@ -1065,7 +1065,8 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate()
 
     QPixmapCache::clear();
 
-    delete  platform_theme;
+    delete platform_theme;
+    platform_theme = 0;
     delete platform_integration;
     platform_integration = 0;
     delete m_gammaTables.load();