1 files changed, 30 insertions, 12 deletions

diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index e321b4c9..7086db91 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -40,6 +40,7 @@
 #include "qquickmenubaritem_p.h"
 #include "qquickmenubar_p.h"
 #include "qquickpopupitem_p_p.h"
+#include "qquickpopuppositioner_p_p.h"
 #include "qquickaction_p.h"
 
 #include <QtGui/qevent.h>
@@ -183,6 +184,14 @@ static bool shouldCascade()
 #endif
 }
 
+class QQuickMenuPositioner : public QQuickPopupPositioner
+{
+public:
+    QQuickMenuPositioner(QQuickMenu *menu) : QQuickPopupPositioner(menu) { }
+
+    void reposition() override;
+};
+
 QQuickMenuPrivate::QQuickMenuPrivate()
 {
     Q_Q(QQuickMenu);
@@ -390,21 +399,30 @@ void QQuickMenuPrivate::itemGeometryChanged(QQuickItem *, QQuickGeometryChange,
         resizeItems();
 }
 
-void QQuickMenuPrivate::reposition()
+QQuickPopupPositioner *QQuickMenuPrivate::getPositioner()
 {
     Q_Q(QQuickMenu);
-    if (parentMenu) {
-        if (cascade) {
-            if (popupItem->isMirrored())
-                q->setPosition(QPointF(-q->width() - parentMenu->leftPadding() + q->overlap(), -q->topPadding()));
-            else if (parentItem)
-                q->setPosition(QPointF(parentItem->width() + parentMenu->rightPadding() - q->overlap(), -q->topPadding()));
+    if (!positioner)
+        positioner = new QQuickMenuPositioner(q);
+    return positioner;
+}
+
+void QQuickMenuPositioner::reposition()
+{
+    QQuickMenu *menu = static_cast<QQuickMenu *>(popup());
+    QQuickMenuPrivate *p = QQuickMenuPrivate::get(menu);
+    if (p->parentMenu) {
+        if (p->cascade) {
+            if (p->popupItem->isMirrored())
+                menu->setPosition(QPointF(-menu->width() - p->parentMenu->leftPadding() + menu->overlap(), -menu->topPadding()));
+            else if (p->parentItem)
+                menu->setPosition(QPointF(p->parentItem->width() + p->parentMenu->rightPadding() - menu->overlap(), -menu->topPadding()));
         } else {
-            q->setPosition(QPointF(parentMenu->x() + (parentMenu->width() - q->width()) / 2,
-                                   parentMenu->y() + (parentMenu->height() - q->height()) / 2));
+            menu->setPosition(QPointF(p->parentMenu->x() + (p->parentMenu->width() - menu->width()) / 2,
+                                      p->parentMenu->y() + (p->parentMenu->height() - menu->height()) / 2));
         }
     }
-    QQuickPopupPrivate::reposition();
+    QQuickPopupPositioner::reposition();
 }
 
 bool QQuickMenuPrivate::prepareEnterTransition()
@@ -1451,12 +1469,12 @@ void QQuickMenu::timerEvent(QTimerEvent *event)
 
 QFont QQuickMenu::defaultFont() const
 {
-    return QQuickControlPrivate::themeFont(QPlatformTheme::MenuFont);
+    return QQuickTheme::font(QQuickTheme::Menu);
 }
 
 QPalette QQuickMenu::defaultPalette() const
 {
-    return QQuickControlPrivate::themePalette(QPlatformTheme::MenuPalette);
+    return QQuickTheme::palette(QQuickTheme::Menu);
 }
 
 #if QT_CONFIG(accessibility)