[neon/qt/qtquickcontrols2/Neon/unstable] debian/patches: Add changes to generated files to the last patch.

Mon Apr 29 17:44:21 BST 2024

Git commit 688c44fb425cbeeb706d384ce3423f1324324daf by Dmitry Shachnev.
Committed on 30/07/2022 at 07:44.
Pushed by jriddell into branch 'Neon/unstable'.

Add changes to generated files to the last patch.

M  +29   -13   debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch

https://invent.kde.org/neon/qt/qtquickcontrols2/-/commit/688c44fb425cbeeb706d384ce3423f1324324daf

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
index 170c11d..5c67006 100644
--- a/debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
+++ b/debian/patches/0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
@@ -4,31 +4,47 @@ Date: Fri, 17 Jun 2022 15:24:13 +0200
 Subject: [PATCH] Revert "Allow creation of custom QQuickPopupItem-derived
  types"
 
-This reverts commit 6b8a9673.
-
-The follow-up commit a063cd0b
+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: default avatarRichard Moe Gustavsen <richard.gustavsen at qt.io>
+Reviewed-by: Richard Moe Gustavsen <richard.gustavsen at qt.io>
 
 (cherry-picked from qtdeclarative b69d071c10dfa4c5d7b62692b8a9d7bb659a4ab5)
 ---
- 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 -
- 8 files changed, 100 insertions(+), 196 deletions(-)
+ .../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()

