diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-12-05 09:42:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-05 11:35:16 +0100 |
| commit | d7afbdc2d2b6a7eaa02651887b9dc3408f6d4539 (patch) | |
| tree | c098fe3c7dbdc51c7879f1633d26a1173cea87c2 /src/gui | |
| parent | 85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 (diff) | |
Fixed crash in tst_qguiapplication with QT_QPA_PLATFORM=minimal
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fb14490a24..7abda84bfa 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -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(); |