1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDialogButtonBox: fix crash when adding a QToolButton

Browse Source 
Introduced by commit d4f38a363251fcb5cdfb24d7a1aceb7b630f7e8f

Pick-to: 6.5
Change-Id: I99385249a454c75eeae13c1d17670b356427cb70
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit d9b63c90bf65d853fa74a1327ef7455e1b655fac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 4c3d906068caafb9ce7170f51f93f0e429469397)
This commit is contained in:
David Faure 2024-02-28 16:51:45 +01:00 committed by Qt Cherry-pick Bot
parent f3a603dca6
commit feff14f564
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qdialogbuttonbox.cpp
View File

@ -292,7 +292,7 @@ void QDialogButtonBoxPrivate::layoutButtons()
for (QWidget *here : layoutWidgets) {
QWidget::setTabOrder(prev, here);
prev = here;
if (auto *pushButton = qobject_cast<QPushButton *>(prev); pushButton->isDefault())
if (auto *pushButton = qobject_cast<QPushButton *>(prev); pushButton && pushButton->isDefault())
q->setFocusProxy(pushButton);
}
}