From 0f6e9f7146ffd9f7caade563abf8bd5c60bedcc3 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Sun, 6 Mar 2022 19:15:21 +0200
Subject: [PATCH] Android: don't add all the Service meta-data for Qt 6.2+

These values were removed in Qt 6.2, don't add them in that case.

Fixes: QTCREATORBUG-27088
Change-Id: I5560b18c0a849f7382b498097923ba425e47c40a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/android/androidmanifesteditorwidget.cpp | 9 ++++++++-
 src/plugins/android/androidmanifesteditorwidget.h   | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 90da79c08f7..58868778158 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -1229,8 +1229,15 @@ static void addServiceArgumentsAndLibName(const AndroidServiceData &service, QXm
         writeMetadataElement("android.app.lib_name", "android:value", "-- %%INSERT_APP_LIB_NAME%% --", writer);
 }
 
-static void addServiceMetadata(QXmlStreamWriter &writer)
+void AndroidManifestEditorWidget::addServiceMetadata(QXmlStreamWriter &writer)
 {
+    // The values below are no longer needed in Qt 6.2+, don't add them
+    const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath());
+    if (target) {
+        const QtSupport::QtVersion *qt = QtSupport::QtKitAspect::qtVersion(target->kit());
+        if (qt && qt->qtVersion() >= QtSupport::QtVersionNumber(6, 2))
+            return;
+    }
     writeMetadataElement("android.app.qt_sources_resource_id", "android:resource", "@array/qt_sources", writer);
     writeMetadataElement("android.app.repository", "android:value", "default", writer);
     writeMetadataElement("android.app.qt_libs_resource_id", "android:resource", "@array/qt_libs", writer);
diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 1dd134b08c2..6a99a321a75 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -160,6 +160,8 @@ private:
     QGroupBox *createApplicationGroupBox(QWidget *parent);
     QGroupBox *createAdvancedGroupBox(QWidget *parent);
 
+    void addServiceMetadata(QXmlStreamWriter &writer);
+
     bool m_dirty; // indicates that we need to call syncToEditor()
     bool m_stayClean;
     int m_errorLine;