From bc9ffe62fe36735e946a37bd7ebf4a08513bc7b5 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 31 Oct 2021 18:06:51 +0300 Subject: pkgconfig: propagate variables to JS Change-Id: I902551f9d334b1939e9dae784deb1ad123bf73ea Reviewed-by: Christian Kandeler --- src/lib/corelib/jsextensions/pkgconfigjs.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/corelib/jsextensions/pkgconfigjs.cpp b/src/lib/corelib/jsextensions/pkgconfigjs.cpp index 3bace6f06..59aa3a970 100644 --- a/src/lib/corelib/jsextensions/pkgconfigjs.cpp +++ b/src/lib/corelib/jsextensions/pkgconfigjs.cpp @@ -62,6 +62,14 @@ template QVariantList convert(const C &c, F &&f) return result; } +QVariantMap variablesMapToMap(const PcPackage::VariablesMap &variables) +{ + QVariantMap result; + for (const auto &item: variables) + result.insert(QString::fromStdString(item.first), QString::fromStdString(item.second)); + return result; +} + QVariantMap packageToMap(const PcPackage &package) { QVariantMap result; @@ -127,6 +135,7 @@ QVariantMap packageToMap(const PcPackage &package) result[QStringLiteral("requiresPrivate")] = convert(package.requiresPrivate, requiredVersionToMap); result[QStringLiteral("conflicts")] = convert(package.conflicts, requiredVersionToMap); + result[QStringLiteral("variables")] = variablesMapToMap(package.variables); return result; }; -- cgit v1.2.1