diff options
author | Katja Marttila <katja.marttila@qt.io> | 2016-09-20 14:45:24 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@qt.io> | 2016-11-09 07:08:48 +0000 |
commit | e7f93217182233383851a25ae21bd950d05b408a (patch) | |
tree | 978adb275ec5b3f52a93a610ef5d50d27c6a2479 /src/libs/installer/packagemanagercore_p.h | |
parent | 6e5ef08718b7b638b57dda4ef4a7bdbfe8046743 (diff) |
allow installing compressed packages
This change introduces new feature to add 7z packages to be
installed. Packages must be installer repositories (created with repogen),
compressed to 7z file and named as qtbsp or 7z. Selecting compressed package
is done either with button in component selection page or with
--installCompressedRepository parameter given to installer or to maintenancetool.
Button will not be created by default. If you want to show the button
either build IFW with DEFINES+=INSTALLCOMPRESSED or enable the button in control
script with allowCompressedRepositoryInstall() in ComponentSelectionPageCallback
Task-number: QTIFW-886
Change-Id: Ia060092c348991d5195393b7dc154205f8bf92a5
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.h')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index d78bd3e69..7377feff4 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -175,7 +175,9 @@ signals: public: UpdateFinder *m_updateFinder; + UpdateFinder *m_compressedFinder; QSet<PackageSource> m_packageSources; + QSet<PackageSource> m_compressedPackageSources; std::shared_ptr<LocalPackageHub> m_localPackageHub; QStringList m_filesForDelayedDeletion; @@ -227,9 +229,11 @@ private: bool adminRightsGained, bool deleteOperation); PackagesList remotePackages(); + PackagesList compressedPackages(); LocalPackagesHash localInstalledPackages(); bool fetchMetaInformationFromRepositories(); - bool addUpdateResourcesFromRepositories(bool parseChecksum); + bool fetchMetaInformationFromCompressedRepositories(); + bool addUpdateResourcesFromRepositories(bool parseChecksum, bool compressedRepository = false); void processFilesForDelayedDeletion(); private: @@ -237,6 +241,7 @@ private: MetadataJob m_metadataJob; bool m_updates; + bool m_compressedUpdates; bool m_repoFetched; bool m_updateSourcesAdded; qint64 m_magicBinaryMarker; |