sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6301 from manisandro/qt5.10

Browse Source 
Initial workaround for Qt5.10 instability
This commit is contained in:
Sandro Mani 2018-02-19 14:49:22 +01:00 committed by GitHub
commit b47eb87edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/qgscollapsiblegroupbox.cpp
View File

@ -65,7 +65,11 @@ void QgsCollapsibleGroupBoxBasic::init()
// TODO set size (as well as margins) depending on theme, in updateStyle() // TODO set size (as well as margins) depending on theme, in updateStyle()
mCollapseButton->setIconSize( QSize( 12, 12 ) ); mCollapseButton->setIconSize( QSize( 12, 12 ) );
mCollapseButton->setIcon( mCollapseIcon ); 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 ); setFocusProxy( mCollapseButton );
#endif
setFocusPolicy( Qt::StrongFocus ); setFocusPolicy( Qt::StrongFocus );
connect( mCollapseButton, &QAbstractButton::clicked, this, &QgsCollapsibleGroupBoxBasic::toggleCollapsed ); connect( mCollapseButton, &QAbstractButton::clicked, this, &QgsCollapsibleGroupBoxBasic::toggleCollapsed );