1 files changed, 13 insertions, 13 deletions

diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index c2f16dc335..3a5fbe1b90 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -8,9 +8,9 @@
 #endif
 #if QT_CONFIG(buttongroup)
 #include "qbuttongroup.h"
-#include "private/qapplication_p.h"
 #include "private/qbuttongroup_p.h"
 #endif
+#include "private/qapplication_p.h"
 #include "qabstractbutton_p.h"
 #include "qevent.h"
 #include "qpainter.h"
@@ -21,6 +21,8 @@
 #endif
 #include <qpa/qplatformtheme.h>
 
+#include <QtCore/qpointer.h>
+
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE
@@ -180,10 +182,10 @@ QAbstractButton *QAbstractButtonPrivate::queryCheckedButton() const
 
     Q_Q(const QAbstractButton);
     QList<QAbstractButton *> buttonList = queryButtonList();
-    if (!autoExclusive || buttonList.count() == 1) // no group
+    if (!autoExclusive || buttonList.size() == 1) // no group
         return nullptr;
 
-    for (int i = 0; i < buttonList.count(); ++i) {
+    for (int i = 0; i < buttonList.size(); ++i) {
         QAbstractButton *b = buttonList.at(i);
         if (b->d_func()->checked && b != q)
             return b;
@@ -227,7 +229,7 @@ void QAbstractButtonPrivate::moveFocus(int key)
     QPoint goal = target.center();
     uint focus_flag = qt_tab_all_widgets() ? Qt::TabFocus : Qt::StrongFocus;
 
-    for (int i = 0; i < buttonList.count(); ++i) {
+    for (int i = 0; i < buttonList.size(); ++i) {
         QAbstractButton *button = buttonList.at(i);
         if (button != f && button->window() == f->window() && button->isEnabled() && !button->isHidden() &&
             (exclusive || (button->focusPolicy() & focus_flag) == focus_flag)) {
@@ -310,7 +312,7 @@ void QAbstractButtonPrivate::fixFocusPolicy()
         return;
 
     QList<QAbstractButton *> buttonList = queryButtonList();
-    for (int i = 0; i < buttonList.count(); ++i) {
+    for (int i = 0; i < buttonList.size(); ++i) {
         QAbstractButton *b = buttonList.at(i);
         if (!b->isCheckable())
             continue;
@@ -613,12 +615,13 @@ void QAbstractButton::setChecked(bool checked)
     if (guard)
         d->emitToggled(checked);
 
-
 #if QT_CONFIG(accessibility)
-    QAccessible::State s;
-    s.checked = true;
-    QAccessibleStateChangeEvent event(this, s);
-    QAccessible::updateAccessibility(&event);
+    if (guard) {
+        QAccessible::State s;
+        s.checked = true;
+        QAccessibleStateChangeEvent event(this, s);
+        QAccessible::updateAccessibility(&event);
+    }
 #endif
 }
 
@@ -904,9 +907,6 @@ bool QAbstractButton::event(QEvent *e)
         case QEvent::HoverEnter:
         case QEvent::HoverLeave:
         case QEvent::ContextMenu:
-#if QT_CONFIG(wheelevent)
-        case QEvent::Wheel:
-#endif
             return true;
         default:
             break;