Merge remote-tracking branch 'origin/4.5' into master

Change-Id: If5494504e5afe13b70a818c3d6a5bff024fed459

3 files changed, 9 insertions, 14 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 0254f32d0..a62a23256 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2022 The Qt Company Ltd.
+** Copyright (C) 2023 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -237,7 +237,7 @@ void MetadataJob::doStart()
     }
 
     const ProductKeyCheck *const productKeyCheck = ProductKeyCheck::instance();
-    if (m_downloadType == DownloadType::All || m_downloadType == DownloadType::UpdatesXML) {
+    if (m_downloadType != DownloadType::CompressedPackage) {
         emit infoMessage(this, tr("Fetching latest update information..."));
         const bool onlineInstaller = m_core->isInstaller() && !m_core->isOfflineOnly();
         if (onlineInstaller || m_core->isMaintainer()) {
@@ -538,15 +538,11 @@ void MetadataJob::xmlTaskFinished()
         return;
 
     if (status == XmlDownloadSuccess) {
-        if (m_downloadType != DownloadType::UpdatesXML) {
-            if (!fetchMetaDataPackages()) {
-                // No new metadata packages to fetch, still need to update the cache
-                // for refreshed repositories.
-                startUpdateCacheTask();
-            }
-        } else {
-                startUpdateCacheTask();
-        }
+        if (!fetchMetaDataPackages()) {
+            // No new metadata packages to fetch, still need to update the cache
+            // for refreshed repositories.
+            startUpdateCacheTask();
+        }        
     } else if (status == XmlDownloadRetry) {
         QMetaObject::invokeMethod(this, "doStart", Qt::QueuedConnection);
     } else {
diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h
index 4bc14c683..37d9367e5 100644
--- a/src/libs/installer/metadatajob.h
+++ b/src/libs/installer/metadatajob.h
@@ -48,8 +48,7 @@ class PackageManagerCore;
 enum DownloadType
 {
     All,
-    CompressedPackage,
-    UpdatesXML
+    CompressedPackage
 };
 
 class INSTALLER_EXPORT MetadataJob : public Job
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 8b9ada150..1613cf1c7 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -2497,7 +2497,7 @@ void PackageManagerCore::listAvailablePackages(const QString &regexp, const QHas
         << "Searching packages with regular expression:" << regexp;
 
     ComponentModel *model = defaultComponentModel();
-    d->fetchMetaInformationFromRepositories(DownloadType::UpdatesXML);
+    d->fetchMetaInformationFromRepositories();
 
     d->addUpdateResourcesFromRepositories();
     QRegularExpression re(regexp);