Merge lp:~sil2100/kubuntu-packaging/qtbase-opensource-src_5.0.2_qapp_fix into lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src_5.0.2

[Łukasz Zemczak]

Fix a segmentation fault bug in a strange case when a QWidget element (for instance, a QMenu element) gets freed (destroyed) after the main application exits and QApplication objects stops existing. Do not assume qApp will be present when cleaning memory. Fixes #1273306.

Fix a segmentation fault bug in a strange case when a QWidget element (for instance, a QMenu element) gets freed (destroyed) after the main application exits and QApplication objects stops existing. Do not assume qApp will be present when cleaning memory.

[Dmitry Shachnev (mitya57)]

Is this fixed in 5.2? Or at least submitted upstream?

[Timo Jyrinki (timo-jyrinki)]

Yes, please find out the upstream situation and whether the patch needs to be proposed against trunk and backported to 5.2.0 as well.

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

Ok, it's in upstream trunk and also Qt 5.2 already, it's just that Łukasz found about the fix on his own.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Scheduling to be tested via Landing Plan... https://docs.google.com/a/canonical.com/spreadsheet/ccc?key=0Au6idq7TkpUUdGNWb0tTVmJLVzFZd0doV3dVOGpWemc#gid=0

=== added file 'debian/patches/fix_destroy_qapp_segfault.diff'
--- debian/patches/fix_destroy_qapp_segfault.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_destroy_qapp_segfault.diff	2014-02-03 12:26:23 +0000
@@ -0,0 +1,13 @@
+Index: qtbase-opensource-src-5.0.2+dfsg1/src/widgets/kernel/qwidget_qpa.cpp
+===================================================================
+--- qtbase-opensource-src-5.0.2+dfsg1.orig/src/widgets/kernel/qwidget_qpa.cpp	2013-04-09 01:11:06.000000000 +0100
++++ qtbase-opensource-src-5.0.2+dfsg1/src/widgets/kernel/qwidget_qpa.cpp	2014-02-03 10:33:52.123196922 +0000
+@@ -168,7 +168,7 @@
+         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)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-01-13 09:30:41 +0000
+++ debian/patches/series	2014-02-03 12:26:23 +0000
@@ -21,3 +21,4 @@
 aarch64_fix_atomic_set.patch
 Add-workaround-for-GL-on-Android-emulator.patch
 CVE-2013-4549-xml-expansion.diff
+fix_destroy_qapp_segfault.diff