diff options
author | Jarkko Lehtoranta <jarkko.lehtoranta@jolla.com> | 2019-03-04 11:52:32 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-11-06 12:00:28 +0200 |
commit | c16baa1128b1abf360e9c925c45f1580115cb5d1 (patch) | |
tree | 7c2f6d320a7a7f2ee7cb9cdc8ebcf720b2ad9f0e /src/libs/installer/packagemanagercore.h | |
parent | c46a6424b8130583014d61424db7c79bc7ded1c8 (diff) |
Arrange licenses and filter duplicates
- Add a "priority" attribute to the "License" element used in "package.xml"
for arranging licenses by priority in the LicenseAgreementPage and in CLI.
Priority >0 shows the license on top of others.
- Arrange the licenses with the same priority alphabetically
- Filter duplicate licenses from the LicenseAgreementPage and from CLI
Change-Id: I1dcacdd417d2383b8dc18149e4de329fbf11cfe8
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore.h')
-rw-r--r-- | src/libs/installer/packagemanagercore.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 3fce929ac..5e6ab2867 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -315,6 +315,9 @@ public: static void parseNameAndVersion(const QString &requirement, QString *name, QString *version); static QStringList parseNames(const QStringList &requirements); void commitSessionOperations(); + void clearLicenses(); + QHash<QString, QMap<QString, QString>> sortedLicenses(); + void addLicenseItem(const QHash<QString, QVariantMap> &licenses); public Q_SLOTS: bool runInstaller(); |