1 files changed, 6 insertions, 3 deletions
diff --git a/src/quicktemplates/qquickpopupitem.cpp b/src/quicktemplates/qquickpopupitem.cpp
index 157046ca51..574ea4589a 100644
--- a/src/quicktemplates/qquickpopupitem.cpp
+++ b/src/quicktemplates/qquickpopupitem.cpp
@@ -22,6 +22,11 @@ QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup)
     isTabFence = true;
 }
 
+QQuickPopupItemPrivate *QQuickPopupItemPrivate::get(QQuickPopupItem *popupItem)
+{
+    return popupItem->d_func();
+}
+
 void QQuickPopupItemPrivate::implicitWidthChanged()
 {
     qCDebug(lcPopupItem).nospace() << "implicitWidthChanged called on " << q_func() << "; new implicitWidth is " << implicitWidth;
@@ -71,8 +76,6 @@ void QQuickPopupItemPrivate::executeContentItem(bool complete)
         quickCompleteDeferred(popup, contentItemName(), contentItem);
 }
 
-static inline QString backgroundName() { return QStringLiteral("background"); }
-
 void QQuickPopupItemPrivate::cancelBackground()
 {
     quickCancelDeferred(popup, backgroundName());
@@ -310,7 +313,7 @@ QFont QQuickPopupItem::defaultFont() const
 QAccessible::Role QQuickPopupItem::accessibleRole() const
 {
     Q_D(const QQuickPopupItem);
-    return d->popup->accessibleRole();
+    return d->popup->effectiveAccessibleRole();
 }
 
 void QQuickPopupItem::accessibilityActiveChanged(bool active)