[neon/qt/qtquickcontrols2/Neon/unstable] debian: Drop 0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch.
Dmitry Shachnev
null at kde.org
Mon Apr 29 17:44:21 BST 2024
Git commit 0bfe3d5b26e682bb214b2d2ea790495559d8698a by Dmitry Shachnev.
Committed on 10/09/2022 at 18:30.
Pushed by jriddell into branch 'Neon/unstable'.
Drop 0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch.
Included in the new release.
M +2 -0 debian/changelog
D +0 -439 debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt/qtquickcontrols2/-/commit/0bfe3d5b26e682bb214b2d2ea790495559d8698a
diff --git a/debian/changelog b/debian/changelog
index 03f914b..5ee921b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtquickcontrols2-opensource-src (5.15.6+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
+ * Drop 0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch,
+ included in the new release.
* Add one more patch from KDE's collection: fix scroll bars not showing up
when binding to standalone contentItem.
diff --git a/debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch b/debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
deleted file mode 100644
index 5c67006..0000000
--- a/debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
+++ /dev/null
@@ -1,439 +0,0 @@
-From 59cc1cc5b3719713598a1f426d82a9d895b5dccb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Fri, 17 Jun 2022 15:24:13 +0200
-Subject: [PATCH] Revert "Allow creation of custom QQuickPopupItem-derived
- types"
-
-This reverts commit 6b8a9673111bbf888990ce5904e176057ad4a71b.
-
-The follow-up commit a063cd0be5e8f108a0084831856f4af8c0e9159c
-causes QTBUG-94764, so we don't need this enabling change for now.
-
-Task-number: QTBUG-83630
-Task-number: QTBUG-94764
-Pick-to: 5.15 6.1 6.2
-Change-Id: I1aec8571dcdcc2103d0e56c3d0bbfc4a4872d8db
-Reviewed-by: Richard Moe Gustavsen <richard.gustavsen at qt.io>
-
-(cherry-picked from qtdeclarative b69d071c10dfa4c5d7b62692b8a9d7bb659a4ab5)
----
- .../private/qquickpopupitem_p.h | 1 -
- include/QtQuickTemplates2/headers.pri | 2 +-
- src/quicktemplates2/qquickmenu.cpp | 1 -
- src/quicktemplates2/qquickmenu_p_p.h | 2 +-
- src/quicktemplates2/qquickpopup.cpp | 17 +--
- src/quicktemplates2/qquickpopup_p_p.h | 4 +-
- src/quicktemplates2/qquickpopupitem.cpp | 70 +++++-----
- src/quicktemplates2/qquickpopupitem_p.h | 121 ------------------
- src/quicktemplates2/qquickpopupitem_p_p.h | 80 ++++++++----
- src/quicktemplates2/quicktemplates2.pri | 1 -
- 10 files changed, 101 insertions(+), 198 deletions(-)
- delete mode 100644 include/QtQuickTemplates2/5.15.5/QtQuickTemplates2/private/qquickpopupitem_p.h
- delete mode 100644 src/quicktemplates2/qquickpopupitem_p.h
-
---- a/include/QtQuickTemplates2/5.15.5/QtQuickTemplates2/private/qquickpopupitem_p.h
-+++ /dev/null
-@@ -1 +0,0 @@
--#include "../../../../../src/quicktemplates2/qquickpopupitem_p.h"
---- a/include/QtQuickTemplates2/headers.pri
-+++ b/include/QtQuickTemplates2/headers.pri
-@@ -1,6 +1,6 @@
- SYNCQT.HEADER_FILES =
- SYNCQT.GENERATED_HEADER_FILES = qtquicktemplates2version.h QtQuickTemplates2Version QtQuickTemplates2
--SYNCQT.PRIVATE_HEADER_FILES = qquickabstractbutton_p.h qquickabstractbutton_p_p.h qquickaction_p.h qquickaction_p_p.h qquickactiongroup_p.h qquickapplicationwindow_p.h qquickbusyindicator_p.h qquickbutton_p.h qquickbutton_p_p.h qquickbuttongroup_p.h qquickcheckbox_p.h qquickcheckdelegate_p.h qquickcombobox_p.h qquickcontainer_p.h qquickcontainer_p_p.h qquickcontentitem_p.h qquickcontrol_p.h qquickcontrol_p_p.h qquickdeferredexecute_p_p.h qquickdeferredpointer_p_p.h qquickdelaybutton_p.h qquickdial_p.h qquickdialog_p.h qquickdialog_p_p.h qquickdialogbuttonbox_p.h qquickdialogbuttonbox_p_p.h qquickdrawer_p.h qquickdrawer_p_p.h qquickframe_p.h qquickframe_p_p.h qquickgroupbox_p.h qquickheaderview_p.h qquickheaderview_p_p.h qquickicon_p.h qquickitemdelegate_p.h qquickitemdelegate_p_p.h qquicklabel_p.h qquicklabel_p_p.h qquickmenu_p.h qquickmenu_p_p.h qquickmenubar_p.h qquickmenubar_p_p.h qquickmenubaritem_p.h qquickmenubaritem_p_p.h qquickmenuitem_p.h qquickmenuitem_p_p.h qquickmenuseparator_p.h qquickoverlay_p.h qquickoverlay_p_p.h qquickpage_p.h qquickpage_p_p.h qquickpageindicator_p.h qquickpalette_p.h qquickpaletteprovider_p.h qquickpane_p.h qquickpane_p_p.h qquickpopup_p.h qquickpopup_p_p.h qquickpopupanchors_p.h qquickpopupanchors_p_p.h qquickpopupitem_p.h qquickpopupitem_p_p.h qquickpopuppositioner_p_p.h qquickpresshandler_p_p.h qquickprogressbar_p.h qquickradiobutton_p.h qquickradiodelegate_p.h qquickrangeslider_p.h qquickroundbutton_p.h qquickscrollbar_p.h qquickscrollbar_p_p.h qquickscrollindicator_p.h qquickscrollview_p.h qquickshortcutcontext_p_p.h qquickslider_p.h qquickspinbox_p.h qquicksplitview_p.h qquicksplitview_p_p.h qquickstackelement_p_p.h qquickstacktransition_p_p.h qquickstackview_p.h qquickstackview_p_p.h qquickswipe_p.h qquickswipedelegate_p.h qquickswipedelegate_p_p.h qquickswipeview_p.h qquickswitch_p.h qquickswitchdelegate_p.h qquicktabbar_p.h qquicktabbutton_p.h qquicktextarea_p.h qquicktextarea_p_p.h qquicktextfield_p.h qquicktextfield_p_p.h qquicktheme_p.h qquicktheme_p_p.h qquicktoolbar_p.h qquicktoolbutton_p.h qquicktoolseparator_p.h qquicktooltip_p.h qquicktumbler_p.h qquicktumbler_p_p.h qquickvelocitycalculator_p_p.h qtquicktemplates2global_p.h accessible/qaccessiblequickpage_p.h
-+SYNCQT.PRIVATE_HEADER_FILES = qquickabstractbutton_p.h qquickabstractbutton_p_p.h qquickaction_p.h qquickaction_p_p.h qquickactiongroup_p.h qquickapplicationwindow_p.h qquickbusyindicator_p.h qquickbutton_p.h qquickbutton_p_p.h qquickbuttongroup_p.h qquickcheckbox_p.h qquickcheckdelegate_p.h qquickcombobox_p.h qquickcontainer_p.h qquickcontainer_p_p.h qquickcontentitem_p.h qquickcontrol_p.h qquickcontrol_p_p.h qquickdeferredexecute_p_p.h qquickdeferredpointer_p_p.h qquickdelaybutton_p.h qquickdial_p.h qquickdialog_p.h qquickdialog_p_p.h qquickdialogbuttonbox_p.h qquickdialogbuttonbox_p_p.h qquickdrawer_p.h qquickdrawer_p_p.h qquickframe_p.h qquickframe_p_p.h qquickgroupbox_p.h qquickheaderview_p.h qquickheaderview_p_p.h qquickicon_p.h qquickitemdelegate_p.h qquickitemdelegate_p_p.h qquicklabel_p.h qquicklabel_p_p.h qquickmenu_p.h qquickmenu_p_p.h qquickmenubar_p.h qquickmenubar_p_p.h qquickmenubaritem_p.h qquickmenubaritem_p_p.h qquickmenuitem_p.h qquickmenuitem_p_p.h qquickmenuseparator_p.h qquickoverlay_p.h qquickoverlay_p_p.h qquickpage_p.h qquickpage_p_p.h qquickpageindicator_p.h qquickpalette_p.h qquickpaletteprovider_p.h qquickpane_p.h qquickpane_p_p.h qquickpopup_p.h qquickpopup_p_p.h qquickpopupanchors_p.h qquickpopupanchors_p_p.h qquickpopupitem_p_p.h qquickpopuppositioner_p_p.h qquickpresshandler_p_p.h qquickprogressbar_p.h qquickradiobutton_p.h qquickradiodelegate_p.h qquickrangeslider_p.h qquickroundbutton_p.h qquickscrollbar_p.h qquickscrollbar_p_p.h qquickscrollindicator_p.h qquickscrollview_p.h qquickshortcutcontext_p_p.h qquickslider_p.h qquickspinbox_p.h qquicksplitview_p.h qquicksplitview_p_p.h qquickstackelement_p_p.h qquickstacktransition_p_p.h qquickstackview_p.h qquickstackview_p_p.h qquickswipe_p.h qquickswipedelegate_p.h qquickswipedelegate_p_p.h qquickswipeview_p.h qquickswitch_p.h qquickswitchdelegate_p.h qquicktabbar_p.h qquicktabbutton_p.h qquicktextarea_p.h qquicktextarea_p_p.h qquicktextfield_p.h qquicktextfield_p_p.h qquicktheme_p.h qquicktheme_p_p.h qquicktoolbar_p.h qquicktoolbutton_p.h qquicktoolseparator_p.h qquicktooltip_p.h qquicktumbler_p.h qquicktumbler_p_p.h qquickvelocitycalculator_p_p.h qtquicktemplates2global_p.h accessible/qaccessiblequickpage_p.h
- SYNCQT.QPA_HEADER_FILES =
- SYNCQT.CLEAN_HEADER_FILES =
- SYNCQT.INJECTIONS =
---- 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);
- }
-
---- 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);
---- 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()
---- 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);
-
---- 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()
---- 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
---- 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
---- 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/debian/patches/series b/debian/patches/series
index 736c367..30bb77d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch
0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
0004-QQuickAbstractButton-fix-crash-on-destruction.patch
-0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
disable_fontless_examples_build.patch
More information about the Neon-commits
mailing list