4 files changed, 9 insertions, 31 deletions

diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 507584eb02..7f87288520 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -47,6 +47,7 @@
 #endif
 #include <QtWidgets/QAction>
 #include <qstyle.h>
+#include <private/qwidget_p.h>
 
 #ifndef QT_NO_ACCESSIBILITY
 
@@ -241,15 +242,9 @@ QObject *QAccessibleMenuItem::object() const
 /*! \reimp */
 QWindow *QAccessibleMenuItem::window() const
 {
-    QWindow *result = nullptr;
-    if (!m_owner.isNull()) {
-        result = m_owner->windowHandle();
-        if (!result) {
-            if (const QWidget *nativeParent = m_owner->nativeParentWidget())
-                result = nativeParent->windowHandle();
-        }
-    }
-    return result;
+    return m_owner.isNull()
+        ? nullptr
+        : qt_widget_private(m_owner.data())->windowHandle(QWidgetPrivate::WindowHandleMode::Closest);
 }
 
 QRect QAccessibleMenuItem::rect() const
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index c96d213e7b..27e6b09dc7 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -273,22 +273,6 @@ QRect QAccessibleWidget::rect() const
     return QRect(wpos.x(), wpos.y(), w->width(), w->height());
 }
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <private/qobject_p.h>
-QT_END_INCLUDE_NAMESPACE
-
-class QACConnectionObject : public QObject
-{
-    Q_DECLARE_PRIVATE(QObject)
-public:
-    inline bool isSender(const QObject *receiver, const char *signal) const
-    { return d_func()->isSender(receiver, signal); }
-    inline QObjectList receiverList(const char *signal) const
-    { return d_func()->receiverList(signal); }
-    inline QObjectList senderList() const
-    { return d_func()->senderList(); }
-};
-
 /*!
     Registers \a signal as a controlling signal.
 
@@ -347,9 +331,9 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel
 
     if (match & QAccessible::Controlled) {
         QObjectList allReceivers;
-        QACConnectionObject *connectionObject = (QACConnectionObject*)object();
+        QObject *connectionObject = object();
         for (int sig = 0; sig < d->primarySignals.count(); ++sig) {
-            const QObjectList receivers = connectionObject->receiverList(d->primarySignals.at(sig).toLatin1());
+            const QObjectList receivers = connectionObject->d_func()->receiverList(d->primarySignals.at(sig).toLatin1());
             allReceivers += receivers;
         }
 
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 0d87cc486d..52c953ed3a 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -101,9 +101,9 @@ QString qt_accHotKey(const QString &text);
 
 QList<QWidget*> childWidgets(const QWidget *widget)
 {
-    if (widget == 0)
-        return QList<QWidget*>();
     QList<QWidget*> widgets;
+    if (!widget)
+        return widgets;
     for (QObject *o : widget->children()) {
         QWidget *w = qobject_cast<QWidget *>(o);
         if (!w)
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index 716c833fc9..ca74ee4b12 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -779,8 +779,7 @@ int QAccessibleLineEdit::cursorPosition() const
 QRect QAccessibleLineEdit::characterRect(int offset) const
 {
     int x = lineEdit()->d_func()->control->cursorToX(offset);
-    int y;
-    lineEdit()->getTextMargins(0, &y, 0, 0);
+    int y = lineEdit()->textMargins().top();
     QFontMetrics fm(lineEdit()->font());
     const QString ch = text(offset, offset + 1);
     if (ch.isEmpty())