From 920e4d5f23ac78297d0dbf16560f7385798014cb Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Tue, 3 Sep 2024 12:36:44 +0200
Subject: [PATCH] Qbs: Adapt to build system change

Change-Id: I4d3b9f765222b0f4ff3700e0f6a4640c3e9b9825
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 qbs/modules/pluginjson/pluginjson.qbs | 22 ++++++++++++++++++----
 src/plugins/android/android.qbs       | 12 ++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/qbs/modules/pluginjson/pluginjson.qbs b/qbs/modules/pluginjson/pluginjson.qbs
index 030f3935d96..85d00e46f68 100644
--- a/qbs/modules/pluginjson/pluginjson.qbs
+++ b/qbs/modules/pluginjson/pluginjson.qbs
@@ -38,13 +38,14 @@ Module {
     additionalProductTypes: ["qt_plugin_metadata"]
 
     Rule {
-        inputs: ["pluginJsonIn"]
+        inputs: ["pluginJsonIn", "pluginjson.license", "pluginjson.longDescription"]
+        multiplex: true
 
         Artifact {
             fileTags: ["qt_plugin_metadata"]
             filePath: {
-                var destdir = FileInfo.joinPaths(product.moduleProperty("Qt.core",
-                                                         "generatedHeadersDir"), input.fileName);
+                var destdir = FileInfo.joinPaths(product.Qt.core.generatedHeadersDir,
+                                                 inputs.pluginJsonIn[0].fileName);
                 return destdir.replace(/\.[^\.]*$/,'')
             }
         }
@@ -71,7 +72,7 @@ Module {
             cmd.sourceCode = function() {
                 var i;
                 var vars = pluginJsonReplacements || {};
-                var inf = new TextFile(input.filePath);
+                var inf = new TextFile(inputs.pluginJsonIn[0].filePath);
                 var all = inf.readAll();
                 // replace config vars
                 var qtcVersion = product.moduleProperty("qtc", "qtcreator_version");
@@ -97,6 +98,19 @@ Module {
                 }
                 deplist = deplist.join(",\n")
                 vars['IDE_PLUGIN_DEPENDENCIES'] = "\"Dependencies\" : [\n" + deplist + "\n    ]";
+                vars['LICENSE'] = '"No license"';
+                var licenseInputs = inputs["pluginjson.license"];
+                if (licenseInputs) {
+                    var licFile = new TextFile(licenseInputs[0].filePath);
+                    vars['LICENSE'] = JSON.stringify(licFile.readAll());
+                }
+                vars['LONG_DESCRIPTION'] = '""';
+                var longDescriptionInputs = inputs["pluginjson.longDescription"];
+                if (longDescriptionInputs) {
+                    var longDescFile = new TextFile(longDescriptionInputs[0].filePath);
+                    vars['LONG_DESCRIPTION'] = JSON.stringify(longDescFile.readAll());
+                }
+
                 for (i in vars) {
                     all = all.replace(new RegExp('\\\$\\{' + i + '(?!\w)\\}', 'g'), vars[i]);
                 }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 353bc5350be..de16bda375c 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -99,6 +99,18 @@ QtcPlugin {
         "sdkmanageroutputparser.h"
     ]
 
+    Group {
+        name: "license"
+        files: "LICENSE.md"
+        fileTags: "pluginjson.license"
+    }
+
+    Group {
+        name: "long description"
+        files: "plugindescription.md"
+        fileTags: "pluginjson.longDescription"
+    }
+
     QtcTestFiles {
         files: [
             "android_tst.qrc",