summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Faure <[email protected]>2024-02-28 16:51:45 +0100
committerQt Cherry-pick Bot <[email protected]>2024-02-29 11:06:06 +0000
commitfeff14f564478546212a5b187a931170b4ac65f6 (patch)
treeed2051bd0a5af8f325e327f496bf7502dbc62030 /src
parentf3a603dca69b07605476e1a4ef0bc7c9da2db9f8 (diff)
QDialogButtonBox: fix crash when adding a QToolButton
Introduced by commit d4f38a363251fcb5cdfb24d7a1aceb7b630f7e8f Pick-to: 6.5 Change-Id: I99385249a454c75eeae13c1d17670b356427cb70 Reviewed-by: Axel Spoerl <[email protected]> (cherry picked from commit d9b63c90bf65d853fa74a1327ef7455e1b655fac) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit 4c3d906068caafb9ce7170f51f93f0e429469397)
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 94988ffec45..ee20fb849c5 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -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);
}
}