[neon/qt/qtcreator/Neon/release] debian: disable QmlDesigner plugin w/ qt < 6.2.0

[Pino Toscano]

Git commit 86cdc92466af02a07b0f4bdaf8dfade0bcbde2ef by Pino Toscano.
Committed on 19/01/2022 at 20:12.
Pushed by jriddell into branch 'Neon/release'.

disable QmlDesigner plugin w/ qt < 6.2.0

backport upstream commit 8acd2b15a9f12ba7de7281e6617963543a96056e

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

https://invent.kde.org/neon/qt/qtcreator/commit/86cdc92466af02a07b0f4bdaf8dfade0bcbde2ef

diff --git a/debian/changelog b/debian/changelog
index b74e6bb..72eaf00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qtcreator (6.0.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 8acd2b15a9f12ba7de7281e6617963543a96056e to disable
+    the build of the QmlDesigner plugin with Qt < 6.2.0; qtcreator is currently
+    build with Qt 5, and that plugin fails to build on 32bit architectures;
+    patch upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 19 Jan 2022 21:06:03 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 860a57d..ac985ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 #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
new file mode 100644
index 0000000..4999a8c
--- /dev/null
+++ b/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
@@ -0,0 +1,31 @@
+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
+