1 files changed, 26 insertions, 17 deletions

diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
index f835aef4..cf2fec41 100644
--- a/src/quicktemplates2/qquickpopupitem.cpp
+++ b/src/quicktemplates2/qquickpopupitem.cpp
@@ -37,7 +37,8 @@
 #include "qquickpopupitem_p_p.h"
 #include "qquickapplicationwindow_p.h"
 #include "qquickshortcutcontext_p_p.h"
-#include "qquickcontrol_p_p.h"
+#include "qquickpage_p_p.h"
+#include "qquickcontentitem_p.h"
 #include "qquickpopup_p_p.h"
 #include "qquickdeferredexecute_p_p.h"
 
@@ -46,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickPopupItemPrivate : public QQuickControlPrivate
+class QQuickPopupItemPrivate : public QQuickPagePrivate
 {
     Q_DECLARE_PUBLIC(QQuickPopupItem)
 
@@ -80,13 +81,13 @@ QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup)
 
 void QQuickPopupItemPrivate::implicitWidthChanged()
 {
-    QQuickControlPrivate::implicitWidthChanged();
+    QQuickPagePrivate::implicitWidthChanged();
     emit popup->implicitWidthChanged();
 }
 
 void QQuickPopupItemPrivate::implicitHeightChanged()
 {
-    QQuickControlPrivate::implicitHeightChanged();
+    QQuickPagePrivate::implicitHeightChanged();
     emit popup->implicitHeightChanged();
 }
 
@@ -95,7 +96,7 @@ void QQuickPopupItemPrivate::resolveFont()
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window()))
         inheritFont(window->font());
     else
-        inheritFont(themeFont(QPlatformTheme::SystemFont));
+        inheritFont(QQuickTheme::font(QQuickTheme::System));
 }
 
 void QQuickPopupItemPrivate::resolvePalette()
@@ -103,15 +104,16 @@ void QQuickPopupItemPrivate::resolvePalette()
     if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window()))
         inheritPalette(window->palette());
     else
-        inheritPalette(themePalette(QPlatformTheme::SystemPalette));
+        inheritPalette(QQuickTheme::palette(QQuickTheme::System));
 }
 
 QQuickItem *QQuickPopupItemPrivate::getContentItem()
 {
     Q_Q(QQuickPopupItem);
-    if (QQuickItem *item = QQuickControlPrivate::getContentItem())
+    if (QQuickItem *item = QQuickPagePrivate::getContentItem())
         return item;
-    return new QQuickItem(q);
+
+    return new QQuickContentItem(popup, q);
 }
 
 static inline QString contentItemName() { return QStringLiteral("contentItem"); }
@@ -151,7 +153,7 @@ void QQuickPopupItemPrivate::executeBackground(bool complete)
 }
 
 QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup)
-    : QQuickControl(*(new QQuickPopupItemPrivate(popup)), nullptr)
+    : QQuickPage(*(new QQuickPopupItemPrivate(popup)), nullptr)
 {
     setParent(popup);
     setFlag(ItemIsFocusScope);
@@ -305,28 +307,35 @@ void QQuickPopupItem::wheelEvent(QWheelEvent *event)
 void QQuickPopupItem::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::contentItemChange(newItem, oldItem);
+    QQuickPage::contentItemChange(newItem, oldItem);
     d->popup->contentItemChange(newItem, oldItem);
 }
 
+void QQuickPopupItem::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize)
+{
+    Q_D(QQuickPopupItem);
+    QQuickPage::contentSizeChange(newSize, oldSize);
+    d->popup->contentSizeChange(newSize, oldSize);
+}
+
 void QQuickPopupItem::fontChange(const QFont &newFont, const QFont &oldFont)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::fontChange(newFont, oldFont);
+    QQuickPage::fontChange(newFont, oldFont);
     d->popup->fontChange(newFont, oldFont);
 }
 
 void QQuickPopupItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::geometryChanged(newGeometry, oldGeometry);
+    QQuickPage::geometryChanged(newGeometry, oldGeometry);
     d->popup->geometryChanged(newGeometry, oldGeometry);
 }
 
 void QQuickPopupItem::localeChange(const QLocale &newLocale, const QLocale &oldLocale)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::localeChange(newLocale, oldLocale);
+    QQuickPage::localeChange(newLocale, oldLocale);
     d->popup->localeChange(newLocale, oldLocale);
 }
 
@@ -339,21 +348,21 @@ void QQuickPopupItem::mirrorChange()
 void QQuickPopupItem::itemChange(ItemChange change, const ItemChangeData &data)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::itemChange(change, data);
+    QQuickPage::itemChange(change, data);
     d->popup->itemChange(change, data);
 }
 
 void QQuickPopupItem::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::paddingChange(newPadding, oldPadding);
+    QQuickPage::paddingChange(newPadding, oldPadding);
     d->popup->paddingChange(newPadding, oldPadding);
 }
 
 void QQuickPopupItem::paletteChange(const QPalette &newPalette, const QPalette &oldPalette)
 {
     Q_D(QQuickPopupItem);
-    QQuickControl::paletteChange(newPalette, oldPalette);
+    QQuickPage::paletteChange(newPalette, oldPalette);
     d->popup->paletteChange(newPalette, oldPalette);
 }
 
@@ -379,7 +388,7 @@ QAccessible::Role QQuickPopupItem::accessibleRole() const
 void QQuickPopupItem::accessibilityActiveChanged(bool active)
 {
     Q_D(const QQuickPopupItem);
-    QQuickControl::accessibilityActiveChanged(active);
+    QQuickPage::accessibilityActiveChanged(active);
     d->popup->accessibilityActiveChanged(active);
 }
 #endif