[neon/qt/qtcreator/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 4fe86f587a930b6f0aa0d5ca97cbbc923e71ecce by Pino Toscano.
Committed on 11/02/2022 at 22:13.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch:
  dropped, backported from upstream

M  +3    -0    debian/changelog
M  +0    -1    debian/patches/series
D  +0    -31   debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch

https://invent.kde.org/neon/qt/qtcreator/commit/4fe86f587a930b6f0aa0d5ca97cbbc923e71ecce

diff --git a/debian/changelog b/debian/changelog
index 7b8b2ec..3815c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ qtcreator (7.0.0~beta1-0r1) UNRELEASED; urgency=medium
   * Update the build dependencies according to the upstream build system:
     - bump cmake to 3.16
     - bump the Qt packages to 5.15.2
+  * Update the patches:
+    - upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch:
+      dropped, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 11 Feb 2022 22:47:39 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index ac985ed..860a57d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #Backported patches
-upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
 
 # Debian patches.
 debian_paths.diff
diff --git a/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch b/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
deleted file mode 100644
index 4999a8c..0000000
--- a/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8acd2b15a9f12ba7de7281e6617963543a96056e Mon Sep 17 00:00:00 2001
-From: Eike Ziller <eike.ziller at qt.io>
-Date: Tue, 18 Jan 2022 14:46:14 +0100
-Subject: [PATCH] Disable QmlDesigner plugin for Qt 5 based builds
-
-Design Studio is Qt 6 based only, and since QmlDesigner development is
-mostly done for that and by that team, don't restrict it to stay
-compatible.
-
-Change-Id: I9252a2a34f7395d9dc6800f59a37fc23d9f30052
-Reviewed-by: hjk <hjk at qt.io>
----
- src/plugins/qmldesigner/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
-index aad701fc30..b032f2c818 100644
---- a/src/plugins/qmldesigner/CMakeLists.txt
-+++ b/src/plugins/qmldesigner/CMakeLists.txt
-@@ -4,7 +4,7 @@ if (APPLE)
- endif()
- 
- add_qtc_plugin(QmlDesigner
--  CONDITION TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg
-+  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg
-   DEPENDS
-     QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
-     Qt5::QuickWidgets Qt5::CorePrivate Sqlite Qt5::Xml Qt5::Svg
--- 
-2.34.1
-