diff options
author | Katja Marttila <katja.marttila@qt.io> | 2021-08-30 11:38:56 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2021-09-02 11:43:40 +0300 |
commit | 2767b0c96a0dbe713bc2d1e346d10f6787556d5b (patch) | |
tree | ca5342d36215e74db756af83b1367c0ce722ded8 /src/libs/installer/packagemanagercore_p.h | |
parent | 08a123c86b9aae85da1be1542578de060df4868b (diff) |
Fix qbsp adding from GUI
Qbsp package adding failed using gui if the package with the same name
existed in the component tree.
Also increased priority to qbsp package so that if the same name and version
exists in the component tree then qbsp package is used.
Task-number: QTIFW-2312
Change-Id: I732fef1a7ba503d2332f411e15b6873c63dcf630
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.h')
-rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index b29808228..65f0e43eb 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -177,7 +177,6 @@ signals: public: UpdateFinder *m_updateFinder; - UpdateFinder *m_compressedFinder; QSet<PackageSource> m_packageSources; QSet<PackageSource> m_compressedPackageSources; std::shared_ptr<LocalPackageHub> m_localPackageHub; @@ -244,10 +243,8 @@ private: bool adminRightsGained, bool deleteOperation); PackagesList remotePackages(); - PackagesList compressedPackages(); LocalPackagesHash localInstalledPackages(); bool fetchMetaInformationFromRepositories(DownloadType type = DownloadType::All); - bool fetchMetaInformationFromCompressedRepositories(); bool addUpdateResourcesFromRepositories(bool parseChecksum, bool compressedRepository = false); void processFilesForDelayedDeletion(); void findExecutablesRecursive(const QString &path, const QStringList &excludeFiles, QStringList *result); @@ -263,7 +260,6 @@ private: MetadataJob m_metadataJob; bool m_updates; - bool m_compressedUpdates; bool m_repoFetched; bool m_updateSourcesAdded; qint64 m_magicBinaryMarker; |