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/component_p.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/component_p.h')
| -rw-r--r-- | src/libs/installer/component_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/component_p.h b/src/libs/installer/component_p.h index c14d53e70..e4d28d26a 100644 --- a/src/libs/installer/component_p.h +++ b/src/libs/installer/component_p.h @@ -77,7 +77,7 @@ public: QHash<QString, QPointer<QWidget> > m_userInterfaces; // < display name, < file name, file content > > - QHash<QString, QPair<QString, QString> > m_licenses; + QHash<QString, QVariantMap> m_licenses; QList<QPair<QString, bool> > m_pathsForUninstallation; }; |