diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:54 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 01:00:55 +0200 |
commit | ba2b7b8e33635f29bae8e9e580b23a544de7727f (patch) | |
tree | 15514c09367f27944bd8a9198217639846e1a4b5 /src/widgets/widgets | |
parent | aadc294f2dd1c7e94a997f5797bc83b34d2c59ff (diff) | |
parent | 43ea15d01cd491639d8cb5eb85da066f5d0a8571 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib58433da04bffb5dfab5486b80f17f39cc4145fa
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdialogbuttonbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index 9f5b739230..d93e71e32f 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -858,7 +858,7 @@ void QDialogButtonBoxPrivate::_q_handleButtonClicked() if (!guard) return; - switch (buttonRole) { + switch (QPlatformDialogHelper::ButtonRole(buttonRole)) { case QPlatformDialogHelper::AcceptRole: case QPlatformDialogHelper::YesRole: emit q->accepted(); |