From e324f5bc0e6abb8772b29f5016afda0814d8f9cd Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Tue, 23 Apr 2013 12:01:01 +0200 Subject: Fix crash when deleting a QMenu on exit If the application object is an ancestor of QMenu, dereferencing qApp in its destructor will cause a crash. Task-number: QTBUG-30756 Change-Id: I31a33db0fd783bb210a420618911ea8b412e9a0f Reviewed-by: Frederik Gladhorn --- src/widgets/kernel/qwidget_qpa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets/kernel/qwidget_qpa.cpp') diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index fdc72ee23c..a4da98815b 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -172,7 +172,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry())); d->deactivateWidgetCleanup(); - if ((windowType() == Qt::Popup)) + if ((windowType() == Qt::Popup) && qApp) qApp->d_func()->closePopup(this); if (this == QApplicationPrivate::active_window) -- cgit v1.2.3