diff --git a/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch b/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch
index a71785ce9b..c8f52bb585 100644
--- a/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch
+++ b/desktop/toolkit/qt5/qt5-quickcontrols2/files/qt_kde.patch
@@ -1,82 +1,5 @@
-diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
-index 950e4e099..1df0c706d 100644
---- a/src/quicktemplates2/qquickabstractbutton.cpp
-+++ b/src/quicktemplates2/qquickabstractbutton.cpp
-@@ -387,6 +387,17 @@ void QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem *item)
-         emit q->implicitIndicatorHeightChanged();
- }
- 
-+void QQuickAbstractButtonPrivate::itemDestroyed(QQuickItem *item)
-+{
-+    Q_Q(QQuickAbstractButton);
-+    QQuickControlPrivate::itemDestroyed(item);
-+    if (item == indicator) {
-+        indicator = nullptr;
-+        emit q->implicitIndicatorWidthChanged();
-+        emit q->implicitIndicatorHeightChanged();
-+    }
-+}
-+
- QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const
- {
-     Q_Q(const QQuickAbstractButton);
-diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
-index 9291c1a87..b729720f2 100644
---- a/src/quicktemplates2/qquickabstractbutton_p_p.h
-+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
-@@ -109,6 +109,7 @@ public:
- 
-     void itemImplicitWidthChanged(QQuickItem *item) override;
-     void itemImplicitHeightChanged(QQuickItem *item) override;
-+    void itemDestroyed(QQuickItem *item) override;
- 
-     // copied from qabstractbutton.cpp
-     static const int AUTO_REPEAT_DELAY = 300;
-diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
-index 2041e7741..8610cdfae 100644
---- a/src/quicktemplates2/qquickaction.cpp
-+++ b/src/quicktemplates2/qquickaction.cpp
-@@ -145,7 +145,7 @@ int QQuickActionPrivate::ShortcutEntry::shortcutId() const
- 
- void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled)
- {
--    if (shortcut.isEmpty())
-+    if (shortcut.isEmpty() || m_shortcutId)
-         return;
- 
-     Qt::ShortcutContext context = Qt::WindowShortcut; // TODO
-diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
-index f38c2b09c..6eed2a024 100644
---- a/src/quicktemplates2/qquickcontainer.cpp
-+++ b/src/quicktemplates2/qquickcontainer.cpp
-@@ -225,6 +225,7 @@ void QQuickContainerPrivate::cleanup()
-     QObject::disconnect(contentModel, &QQmlObjectModel::countChanged, q, &QQuickContainer::countChanged);
-     QObject::disconnect(contentModel, &QQmlObjectModel::childrenChanged, q, &QQuickContainer::contentChildrenChanged);
-     delete contentModel;
-+    contentModel = nullptr;
- }
- 
- QQuickItem *QQuickContainerPrivate::itemAt(int index) const
-@@ -436,7 +437,7 @@ void QQuickContainerPrivate::contentChildren_clear(QQmlListProperty<QQuickItem>
- void QQuickContainerPrivate::updateContentWidth()
- {
-     Q_Q(QQuickContainer);
--    if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth))
-+    if (hasContentWidth || qFuzzyCompare(contentWidth, implicitContentWidth) || !contentModel)
-         return;
- 
-     contentWidth = implicitContentWidth;
-@@ -446,7 +447,7 @@ void QQuickContainerPrivate::updateContentWidth()
- void QQuickContainerPrivate::updateContentHeight()
- {
-     Q_Q(QQuickContainer);
--    if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight))
-+    if (hasContentHeight || qFuzzyCompare(contentHeight, implicitContentHeight) || !contentModel)
-         return;
- 
-     contentHeight = implicitContentHeight;
 diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
-index bbbd0e622..1f4b47343 100644
+index bbbd0e622ad65ea40576ee74cd81082ce2450b12..1f4b47343c5b2a2c0d8efae64db460c567144f29 100644
 --- a/src/quicktemplates2/qquickcontrol.cpp
 +++ b/src/quicktemplates2/qquickcontrol.cpp
 @@ -845,6 +845,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
@@ -124,7 +47,7 @@ index bbbd0e622..1f4b47343 100644
  {
      Q_Q(QQuickControl);
 diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
-index 8e979079e..a6e624c91 100644
+index 8e979079e0a8894712f4123ea173d0edb4915237..a6e624c911ad988b61571b2534cb540e3dcd2265 100644
 --- a/src/quicktemplates2/qquickcontrol_p_p.h
 +++ b/src/quicktemplates2/qquickcontrol_p_p.h
 @@ -173,6 +173,7 @@ public:
@@ -135,455 +58,8 @@ index 8e979079e..a6e624c91 100644
  
      void updateBaselineOffset();
  
-diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
-index e6db14eb5..6197d1547 100644
---- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
-+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
-@@ -237,7 +237,7 @@ static QRectF alignedRect(Qt::LayoutDirection direction, Qt::Alignment alignment
- void QQuickDialogButtonBoxPrivate::resizeContent()
- {
-     Q_Q(QQuickDialogButtonBox);
--    if (!contentItem)
-+    if (!contentItem || !contentModel)
-         return;
- 
-     QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding());
-@@ -322,6 +322,9 @@ void QQuickDialogButtonBoxPrivate::updateLayout()
- qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
- {
-     Q_Q(const QQuickDialogButtonBox);
-+    if (!contentModel)
-+        return 0;
-+
-     const int count = contentModel->count();
-     const qreal totalSpacing = qMax(0, count - 1) * spacing;
-     qreal totalWidth = totalSpacing;
-@@ -341,6 +344,9 @@ qreal QQuickDialogButtonBoxPrivate::getContentWidth() const
- qreal QQuickDialogButtonBoxPrivate::getContentHeight() const
- {
-     Q_Q(const QQuickDialogButtonBox);
-+    if (!contentModel)
-+        return 0;
-+
-     const int count = contentModel->count();
-     qreal maxHeight = 0;
-     for (int i = 0; i < count; ++i) {
-diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
-index a934fa8ae..0043dddde 100644
---- a/src/quicktemplates2/qquickmenu.cpp
-+++ b/src/quicktemplates2/qquickmenu.cpp
-@@ -222,7 +222,6 @@ QQuickMenuPrivate::QQuickMenuPrivate()
- void QQuickMenuPrivate::init()
- {
-     Q_Q(QQuickMenu);
--    QQuickPopupPrivate::init();
-     contentModel = new QQmlObjectModel(q);
- }
- 
-diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h
-index b1fbb1efb..63553f8a5 100644
---- a/src/quicktemplates2/qquickmenu_p_p.h
-+++ b/src/quicktemplates2/qquickmenu_p_p.h
-@@ -73,7 +73,7 @@ public:
-         return menu->d_func();
-     }
- 
--    void init() override;
-+    void init();
- 
-     QQuickItem *itemAt(int index) const;
-     void insertItem(int index, QQuickItem *item);
-diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
-index b8d417f29..c8cd142ae 100644
---- a/src/quicktemplates2/qquickoverlay.cpp
-+++ b/src/quicktemplates2/qquickoverlay.cpp
-@@ -399,8 +399,11 @@ void QQuickOverlay::itemChange(ItemChange change, const ItemChangeData &data)
-     Q_D(QQuickOverlay);
-     QQuickItem::itemChange(change, data);
- 
--    if (change == ItemChildAddedChange || change == ItemChildRemovedChange)
-+    if (change == ItemChildAddedChange || change == ItemChildRemovedChange) {
-         setVisible(!d->allDrawers.isEmpty() || !childItems().isEmpty());
-+        if (data.item->parent() == d->mouseGrabberPopup)
-+            d->setMouseGrabberPopup(nullptr);
-+    }
- }
- 
- void QQuickOverlay::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
-diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
-index 8a03198e5..bdc6dff27 100644
---- a/src/quicktemplates2/qquickpopup.cpp
-+++ b/src/quicktemplates2/qquickpopup.cpp
-@@ -275,21 +275,9 @@ QQuickPopupPrivate::QQuickPopupPrivate()
- void QQuickPopupPrivate::init()
- {
-     Q_Q(QQuickPopup);
--    createPopupItem();
-+    popupItem = new QQuickPopupItem(q);
-     popupItem->setVisible(false);
-     q->setParentItem(qobject_cast<QQuickItem *>(parent));
--    connectToPopupItem();
--}
--
--void QQuickPopupPrivate::createPopupItem()
--{
--    Q_Q(QQuickPopup);
--    popupItem = new QQuickPopupItem(q);
--}
--
--void QQuickPopupPrivate::connectToPopupItem()
--{
--    Q_Q(QQuickPopup);
-     QObject::connect(popupItem, &QQuickControl::paddingChanged, q, &QQuickPopup::paddingChanged);
-     QObject::connect(popupItem, &QQuickControl::backgroundChanged, q, &QQuickPopup::backgroundChanged);
-     QObject::connect(popupItem, &QQuickControl::contentItemChanged, q, &QQuickPopup::contentItemChanged);
-@@ -854,7 +842,8 @@ QQuickPopup::QQuickPopup(QObject *parent)
- QQuickPopup::QQuickPopup(QQuickPopupPrivate &dd, QObject *parent)
-     : QObject(dd, parent)
- {
--    dd.init();
-+    Q_D(QQuickPopup);
-+    d->init();
- }
- 
- QQuickPopup::~QQuickPopup()
-diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
-index 2fc0f133d..ef4b112e2 100644
---- a/src/quicktemplates2/qquickpopup_p_p.h
-+++ b/src/quicktemplates2/qquickpopup_p_p.h
-@@ -96,9 +96,7 @@ public:
-     QQmlListProperty<QObject> contentData();
-     QQmlListProperty<QQuickItem> contentChildren();
- 
--    virtual void init();
--    void createPopupItem();
--    void connectToPopupItem();
-+    void init();
-     void closeOrReject();
-     bool tryClose(const QPointF &pos, QQuickPopup::ClosePolicy flags);
- 
-diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp
-index 992d74570..0069b9fc1 100644
---- a/src/quicktemplates2/qquickpopupitem.cpp
-+++ b/src/quicktemplates2/qquickpopupitem.cpp
-@@ -53,33 +53,38 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+class QQuickPopupItemPrivate : public QQuickPagePrivate
-+{
-+    Q_DECLARE_PUBLIC(QQuickPopupItem)
-+
-+public:
-+    QQuickPopupItemPrivate(QQuickPopup *popup);
-+
-+    void implicitWidthChanged() override;
-+    void implicitHeightChanged() override;
-+
-+    void resolveFont() override;
-+    void resolvePalette() override;
-+
-+    QQuickItem *getContentItem() override;
-+
-+    void cancelContentItem() override;
-+    void executeContentItem(bool complete = false) override;
-+
-+    void cancelBackground() override;
-+    void executeBackground(bool complete = false) override;
-+
-+    int backId = 0;
-+    int escapeId = 0;
-+    QQuickPopup *popup = nullptr;
-+};
-+
- QQuickPopupItemPrivate::QQuickPopupItemPrivate(QQuickPopup *popup)
-     : popup(popup)
- {
-     isTabFence = true;
- }
- 
--void QQuickPopupItemPrivate::init()
--{
--    Q_Q(QQuickPopupItem);
--    q->setParent(popup);
--    q->setFlag(QQuickItem::ItemIsFocusScope);
--    q->setAcceptedMouseButtons(Qt::AllButtons);
--#if QT_CONFIG(quicktemplates2_multitouch)
--    q->setAcceptTouchEvents(true);
--#endif
--#if QT_CONFIG(cursor)
--    q->setCursor(Qt::ArrowCursor);
--#endif
--
--#if QT_CONFIG(quicktemplates2_hover)
--    // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8
--    q->setHoverEnabled(true);
--    // setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects());
--    // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
--#endif
--}
--
- void QQuickPopupItemPrivate::implicitWidthChanged()
- {
-     QQuickPagePrivate::implicitWidthChanged();
-@@ -156,15 +161,22 @@ void QQuickPopupItemPrivate::executeBackground(bool complete)
- QQuickPopupItem::QQuickPopupItem(QQuickPopup *popup)
-     : QQuickPage(*(new QQuickPopupItemPrivate(popup)), nullptr)
- {
--    Q_D(QQuickPopupItem);
--    d->init();
--}
-+    setParent(popup);
-+    setFlag(ItemIsFocusScope);
-+    setAcceptedMouseButtons(Qt::AllButtons);
-+#if QT_CONFIG(quicktemplates2_multitouch)
-+    setAcceptTouchEvents(true);
-+#endif
-+#if QT_CONFIG(cursor)
-+    setCursor(Qt::ArrowCursor);
-+#endif
- 
--QQuickPopupItem::QQuickPopupItem(QQuickPopupItemPrivate &dd) :
--    QQuickPage(dd, nullptr)
--{
--    Q_D(QQuickPopupItem);
--    d->init();
-+#if QT_CONFIG(quicktemplates2_hover)
-+    // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8
-+    setHoverEnabled(true);
-+    // setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects());
-+    // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, this, &QQuickItem::setAcceptHoverEvents);
-+#endif
- }
- 
- void QQuickPopupItem::grabShortcut()
-diff --git a/src/quicktemplates2/qquickpopupitem_p.h b/src/quicktemplates2/qquickpopupitem_p.h
-deleted file mode 100644
-index df67e7453..000000000
---- a/src/quicktemplates2/qquickpopupitem_p.h
-+++ /dev/null
-@@ -1,121 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2021 The Qt Company Ltd.
--** Contact: https://www.qt.io/licensing/
--**
--** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
--**
--** $QT_BEGIN_LICENSE:COMM$
--**
--** Commercial License Usage
--** Licensees holding valid commercial Qt licenses may use this file in
--** accordance with the commercial license agreement provided with the
--** Software or, alternatively, in accordance with the terms contained in
--** a written agreement between you and The Qt Company. For licensing terms
--** and conditions see https://www.qt.io/terms-conditions. For further
--** information use the contact form at https://www.qt.io/contact-us.
--**
--** $QT_END_LICENSE$
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--**
--****************************************************************************/
--
--#ifndef QQUICKPOPUPITEM_P_H
--#define QQUICKPOPUPITEM_P_H
--
--//
--//  W A R N I N G
--//  -------------
--//
--// This file is not part of the Qt API.  It exists purely as an
--// implementation detail.  This header file may change from version to
--// version without notice, or even be removed.
--//
--// We mean it.
--//
--
--#include <QtQuickTemplates2/private/qquickpage_p.h>
--#include <QtQuickTemplates2/private/qquickpage_p_p.h>
--
--QT_BEGIN_NAMESPACE
--
--class QQuickPopup;
--class QQuickPopupItemPrivate;
--
--class QQuickPopupItem : public QQuickPage
--{
--    Q_OBJECT
--
--public:
--    explicit QQuickPopupItem(QQuickPopup *popup);
--
--    void grabShortcut();
--    void ungrabShortcut();
--
--protected:
--    void updatePolish() override;
--
--    bool event(QEvent *event) override;
--    bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
--    void focusInEvent(QFocusEvent *event) override;
--    void focusOutEvent(QFocusEvent *event) override;
--    void keyPressEvent(QKeyEvent *event) override;
--    void keyReleaseEvent(QKeyEvent *event) override;
--    void mousePressEvent(QMouseEvent *event) override;
--    void mouseMoveEvent(QMouseEvent *event) override;
--    void mouseReleaseEvent(QMouseEvent *event) override;
--    void mouseDoubleClickEvent(QMouseEvent *event) override;
--    void mouseUngrabEvent() override;
--#if QT_CONFIG(quicktemplates2_multitouch)
--    void touchEvent(QTouchEvent *event) override;
--    void touchUngrabEvent() override;
--#endif
--#if QT_CONFIG(wheelevent)
--    void wheelEvent(QWheelEvent *event) override;
--#endif
--
--    void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
--    void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override;
--    void fontChange(const QFont &newFont, const QFont &oldFont) override;
--    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
--    void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
--    void mirrorChange() override;
--    void itemChange(ItemChange change, const ItemChangeData &data) override;
--    void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
--    void paletteChange(const QPalette &newPalette, const QPalette &oldPalette) override;
--    void enabledChange() override;
--
--    QFont defaultFont() const override;
--    QPalette defaultPalette() const override;
--
--#if QT_CONFIG(accessibility)
--    QAccessible::Role accessibleRole() const override;
--    void accessibilityActiveChanged(bool active) override;
--#endif
--
--protected:
--    QQuickPopupItem(QQuickPopupItemPrivate &dd);
--
--private:
--    Q_DISABLE_COPY(QQuickPopupItem)
--    Q_DECLARE_PRIVATE(QQuickPopupItem)
--    friend class QQuickPopup;
--};
--
--QT_END_NAMESPACE
--
--#endif // QQUICKPOPUPITEM_P_H
-diff --git a/src/quicktemplates2/qquickpopupitem_p_p.h b/src/quicktemplates2/qquickpopupitem_p_p.h
-index 65b33b21e..a12e43e0a 100644
---- a/src/quicktemplates2/qquickpopupitem_p_p.h
-+++ b/src/quicktemplates2/qquickpopupitem_p_p.h
-@@ -48,39 +48,67 @@
- // We mean it.
- //
- 
--#include <QtQuickTemplates2/private/qquickpopupitem_p.h>
--#include <QtQuickTemplates2/private/qquickpalette_p.h>
-+#include <QtQuickTemplates2/private/qquickpage_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
- class QQuickPopup;
--
--class QQuickPopupItemPrivate : public QQuickPagePrivate
-+class QQuickPopupItemPrivate;
-+class QQuickPopupItem : public QQuickPage
- {
--    Q_DECLARE_PUBLIC(QQuickPopupItem)
-+    Q_OBJECT
- 
- public:
--    QQuickPopupItemPrivate(QQuickPopup *popup);
--
--    void init();
--
--    void implicitWidthChanged() override;
--    void implicitHeightChanged() override;
--
--    void resolveFont() override;
--    void resolvePalette() override;
--
--    QQuickItem *getContentItem() override;
--
--    void cancelContentItem() override;
--    void executeContentItem(bool complete = false) override;
--
--    void cancelBackground() override;
--    void executeBackground(bool complete = false) override;
--
--    int backId = 0;
--    int escapeId = 0;
--    QQuickPopup *popup = nullptr;
-+    explicit QQuickPopupItem(QQuickPopup *popup);
-+
-+    void grabShortcut();
-+    void ungrabShortcut();
-+
-+protected:
-+    void updatePolish() override;
-+
-+    bool event(QEvent *event) override;
-+    bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
-+    void focusInEvent(QFocusEvent *event) override;
-+    void focusOutEvent(QFocusEvent *event) override;
-+    void keyPressEvent(QKeyEvent *event) override;
-+    void keyReleaseEvent(QKeyEvent *event) override;
-+    void mousePressEvent(QMouseEvent *event) override;
-+    void mouseMoveEvent(QMouseEvent *event) override;
-+    void mouseReleaseEvent(QMouseEvent *event) override;
-+    void mouseDoubleClickEvent(QMouseEvent *event) override;
-+    void mouseUngrabEvent() override;
-+#if QT_CONFIG(quicktemplates2_multitouch)
-+    void touchEvent(QTouchEvent *event) override;
-+    void touchUngrabEvent() override;
-+#endif
-+#if QT_CONFIG(wheelevent)
-+    void wheelEvent(QWheelEvent *event) override;
-+#endif
-+
-+    void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
-+    void contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize) override;
-+    void fontChange(const QFont &newFont, const QFont &oldFont) override;
-+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
-+    void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
-+    void mirrorChange() override;
-+    void itemChange(ItemChange change, const ItemChangeData &data) override;
-+    void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override;
-+    void paletteChange(const QPalette &newPalette, const QPalette &oldPalette) override;
-+    void enabledChange() override;
-+
-+    QFont defaultFont() const override;
-+    QPalette defaultPalette() const override;
-+
-+#if QT_CONFIG(accessibility)
-+    QAccessible::Role accessibleRole() const override;
-+    void accessibilityActiveChanged(bool active) override;
-+#endif
-+
-+private:
-+    Q_DISABLE_COPY(QQuickPopupItem)
-+    Q_DECLARE_PRIVATE(QQuickPopupItem)
-+    friend class QQuickPopup;
- };
- 
- QT_END_NAMESPACE
 diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
-index 4e2f509db..1c4b308cd 100644
+index 4e2f509db503bdbd307c2b293212c30997ce6911..1c4b308cd704075e09683689967f6dec389964ba 100644
 --- a/src/quicktemplates2/qquickscrollbar.cpp
 +++ b/src/quicktemplates2/qquickscrollbar.cpp
 @@ -797,6 +797,14 @@ void QQuickScrollBarAttachedPrivate::initHorizontal()
@@ -611,20 +87,8 @@ index 4e2f509db..1c4b308cd 100644
      layoutVertical();
      vertical->setSize(area->property("heightRatio").toReal());
      vertical->setPosition(area->property("yPosition").toReal());
-diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri
-index ba09591bf..fa6929f92 100644
---- a/src/quicktemplates2/quicktemplates2.pri
-+++ b/src/quicktemplates2/quicktemplates2.pri
-@@ -60,7 +60,6 @@ HEADERS += \
-     $$PWD/qquickpopup_p_p.h \
-     $$PWD/qquickpopupanchors_p.h \
-     $$PWD/qquickpopupanchors_p_p.h \
--    $$PWD/qquickpopupitem_p.h \
-     $$PWD/qquickpopupitem_p_p.h \
-     $$PWD/qquickpopuppositioner_p_p.h \
-     $$PWD/qquickpresshandler_p_p.h \
 diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
-index 0e8b08352..cd4931184 100644
+index 0e8b0835254a5099bda836dff11a3f541447e00a..cd4931184d06a555484885b5d568135aad06477d 100644
 --- a/tests/auto/controls/data/tst_scrollview.qml
 +++ b/tests/auto/controls/data/tst_scrollview.qml
 @@ -576,4 +576,51 @@ TestCase {
@@ -679,166 +143,3 @@ index 0e8b08352..cd4931184 100644
 +        verify(horizontalScrollBar.active)
 +    }
  }
-diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
-index b3fab41ca..10b6baa02 100644
---- a/tests/auto/controls/data/tst_switch.qml
-+++ b/tests/auto/controls/data/tst_switch.qml
-@@ -608,4 +608,27 @@ TestCase {
-         mouseClick(control.indicator)
-         verify(control.activeFocus)
-     }
-+
-+    Component {
-+        id: deletionOrder1
-+        Item {
-+            Image { id: innerImage }
-+            Switch { indicator: innerImage }
-+        }
-+    }
-+
-+    Component {
-+        id: deletionOrder2
-+        Item {
-+            Switch { indicator: innerImage }
-+            Image { id: innerImage }
-+        }
-+    }
-+
-+    function test_deletionOrder() {
-+        var control1 = createTemporaryObject(deletionOrder1, testCase)
-+        verify(control1)
-+        var control2 = createTemporaryObject(deletionOrder2, testCase)
-+        verify(control2)
-+    }
- }
-diff --git a/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
-new file mode 100644
-index 000000000..9e4598b9f
---- /dev/null
-+++ b/tests/auto/qquickpopup/data/releaseAfterExitTransition.qml
-@@ -0,0 +1,78 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2021 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the test suite of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:BSD$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** BSD License Usage
-+** Alternatively, you may use this file under the terms of the BSD license
-+** as follows:
-+**
-+** "Redistribution and use in source and binary forms, with or without
-+** modification, are permitted provided that the following conditions are
-+** met:
-+**   * Redistributions of source code must retain the above copyright
-+**     notice, this list of conditions and the following disclaimer.
-+**   * Redistributions in binary form must reproduce the above copyright
-+**     notice, this list of conditions and the following disclaimer in
-+**     the documentation and/or other materials provided with the
-+**     distribution.
-+**   * Neither the name of The Qt Company Ltd nor the names of its
-+**     contributors may be used to endorse or promote products derived
-+**     from this software without specific prior written permission.
-+**
-+**
-+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+import QtQuick 2.15
-+import QtQuick.Controls 2.15
-+
-+ApplicationWindow {
-+    id: window
-+    width: 400
-+    height: 400
-+    title: "releaseAfterExitTransition"
-+
-+    property alias popup: popup
-+    property alias modalPopup: modalPopup
-+
-+    Popup {
-+        id: popup
-+        y: parent.height - height
-+        width: 50
-+        height: 50
-+    }
-+
-+    Popup {
-+        id: modalPopup
-+        modal: true
-+        y: parent.height - height
-+        width: 50
-+        height: 50
-+        exit:  Transition { PauseAnimation { duration: 100 } }
-+    }
-+}
-diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
-index ede3640c2..f1840946b 100644
---- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
-+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
-@@ -97,6 +97,7 @@ private slots:
-     void invisibleToolTipOpen();
-     void centerInOverlayWithinStackViewItem();
-     void destroyDuringExitTransition();
-+    void releaseAfterExitTransition();
- };
- 
- void tst_QQuickPopup::initTestCase()
-@@ -1459,6 +1460,34 @@ void tst_QQuickPopup::destroyDuringExitTransition()
-     QVERIFY(!button->isDown());
- }
- 
-+void tst_QQuickPopup::releaseAfterExitTransition()
-+{
-+    QQuickApplicationHelper helper(this, "releaseAfterExitTransition.qml");
-+    QVERIFY2(helper.ready, helper.failureMessage());
-+
-+    QQuickWindow *window = helper.window;
-+    window->show();
-+    QVERIFY(QTest::qWaitForWindowActive(window));
-+
-+    QQuickOverlay *overlay = QQuickOverlay::overlay(window);
-+    QQuickPopup *modalPopup = window->property("modalPopup").value<QQuickPopup *>();
-+    QQuickPopup *popup = window->property("popup").value<QQuickPopup *>();
-+
-+    modalPopup->open();
-+    QTRY_VERIFY(modalPopup->isOpened());
-+
-+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
-+    // wait until the transition is finished and the overlay hides itself
-+    QTRY_VERIFY(!overlay->isVisible());
-+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
-+
-+    popup->open();
-+    QTRY_VERIFY(popup->isOpened());
-+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
-+    QTRY_VERIFY(!popup->isOpened());
-+}
-+
-+
- QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup)
- 
- #include "tst_qquickpopup.moc"