Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #6301 from manisandro/qt5.10
Initial workaround for Qt5.10 instability
  • Loading branch information
manisandro committed Feb 19, 2018
2 parents a7ca742 + ea9480e commit b47eb87
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/gui/qgscollapsiblegroupbox.cpp
Expand Up @@ -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 );
Expand Down

0 comments on commit b47eb87

Please sign in to comment.