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>

2 files changed, 4 insertions, 24 deletions

diff --git a/src/libs/kdtools/updatefinder.cpp b/src/libs/kdtools/updatefinder.cpp
index 034e162d3..5bf33d4a4 100644
--- a/src/libs/kdtools/updatefinder.cpp
+++ b/src/libs/kdtools/updatefinder.cpp
@@ -55,18 +55,6 @@ using namespace QInstaller;
     objects.
 */
 
-/*!
-    \fn void KDUpdater::UpdateFinder::addCompressedPackage(bool add)
-    \internal
-
-*/
-
-/*!
-    \fn void KDUpdater::UpdateFinder::isCompressedPackage()
-    \internal
-
-*/
-
 //
 // Private
 //
@@ -182,8 +170,8 @@ void UpdateFinder::Private::computeUpdates()
     // 1. Downloading Update XML files from all the update sources
     // 2. Matching updates with Package XML and figuring out available updates
 
-    if (!q->isCompressedPackage())
-        clear();
+
+    clear();
     cancel = false;
 
     // First do some quick sanity checks on the packages info
@@ -409,8 +397,7 @@ void UpdateFinder::Private::createUpdateObjects(const PackageSource &source,
             delete updates.take(name);
 
         // Create and register the update
-        if (!q->isCompressedPackage() || value == Resolution::AddPackage)
-            updates.insert(name, new Update(source, info));
+        updates.insert(name, new Update(source, info));
     }
 }
 
@@ -450,10 +437,6 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion
                 << ", Source: " << QFileInfo(source.url.toLocalFile()).fileName() << "'";
             return Resolution::RemoveExisting;
         }
-        if (q->isCompressedPackage() && match == 0 && source.priority == existingPackage->packageSource().priority) {
-            //Same package with the same priority and version already exists
-            return Resolution::RemoveExisting;
-        }
         return Resolution::KeepExisting; // otherwise keep existing
     }
     return Resolution::AddPackage;
@@ -468,7 +451,6 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion
 */
 UpdateFinder::UpdateFinder()
     : Task(QLatin1String("UpdateFinder"), Stoppable),
-      m_compressedPackage(false),
       d(new Private(this))
 {
 }
diff --git a/src/libs/kdtools/updatefinder.h b/src/libs/kdtools/updatefinder.h
index 47fa42c9a..7a3e4df1e 100644
--- a/src/libs/kdtools/updatefinder.h
+++ b/src/libs/kdtools/updatefinder.h
@@ -53,8 +53,7 @@ public:
 
     void setLocalPackageHub(std::weak_ptr<LocalPackageHub> hub);
     void setPackageSources(const QSet<QInstaller::PackageSource> &sources);
-    void addCompressedPackage(bool add) { m_compressedPackage = add; }
-    bool isCompressedPackage() { return m_compressedPackage; }
+
 private:
     void doRun();
     bool doStop();
@@ -62,7 +61,6 @@ private:
     bool doResume();
 
 private:
-    bool m_compressedPackage;
     Private *d;
     Q_PRIVATE_SLOT(d, void slotDownloadDone())
 };