diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-10-31 18:06:51 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-01 11:38:59 +0000 |
commit | bc9ffe62fe36735e946a37bd7ebf4a08513bc7b5 (patch) | |
tree | 1300713b3162de97bc4189016187319965bbd765 | |
parent | 9f479174b9c6353aac458f58cc3893203e9c0027 (diff) | |
download | qbs-bc9ffe62fe36735e946a37bd7ebf4a08513bc7b5.tar.gz |
pkgconfig: propagate variables to JS
Change-Id: I902551f9d334b1939e9dae784deb1ad123bf73ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/lib/corelib/jsextensions/pkgconfigjs.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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<typename C, typename F> 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; }; |