From ea9480ef0a7e706c5df5bc28d98dfde425727b7d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 9 Feb 2018 15:07:31 +0100 Subject: [PATCH] Don't set focusProxy in QgsCollapsibleGroupBoxBasic when compiled against Qt5.10+, it causes crashes --- src/gui/qgscollapsiblegroupbox.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp index 227d308f65d..ceea6149241 100644 --- a/src/gui/qgscollapsiblegroupbox.cpp +++ b/src/gui/qgscollapsiblegroupbox.cpp @@ -65,7 +65,11 @@ void QgsCollapsibleGroupBoxBasic::init() // TODO set size (as well as margins) depending on theme, in updateStyle() mCollapseButton->setIconSize( QSize( 12, 12 ) ); mCollapseButton->setIcon( mCollapseIcon ); + // FIXME: This appears to mess up parent-child relationships and causes double-frees of children when destroying in Qt5.10, needs further investigation + // See also https://github.com/qgis/QGIS/pull/6301 +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) setFocusProxy( mCollapseButton ); +#endif setFocusPolicy( Qt::StrongFocus ); connect( mCollapseButton, &QAbstractButton::clicked, this, &QgsCollapsibleGroupBoxBasic::toggleCollapsed );