3 files changed, 11 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 81537814c..fa7e88a04 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1369,7 +1369,10 @@ QString PackageManagerCore::value(const QString &key, const QString &defaultValu
         return dir;
     }
 #endif
-    return d->m_vars.value(key, defaultValue);
+    if (d->m_vars.contains(key))
+        return d->m_vars.value(key);
+
+    return d->m_settings.value(key, defaultValue).toString();
 }
 
 /*!
@@ -1389,7 +1392,7 @@ void PackageManagerCore::setValue(const QString &key, const QString &value)
 */
 bool PackageManagerCore::containsValue(const QString &key) const
 {
-    return d->m_vars.contains(key);
+    return d->m_vars.contains(key) || d->m_settings.containsValue(key);
 }
 
 void PackageManagerCore::setSharedFlag(const QString &key, bool value)
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 151c412eb..181152646 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -465,6 +465,11 @@ void Settings::addUserRepositories(const QSet<Repository> &repositories)
         d->m_data.insertMulti(scUserRepositories, QVariant().fromValue(repository));
 }
 
+bool Settings::containsValue(const QString &key) const
+{
+    return d->m_data.contains(key);
+}
+
 QVariant Settings::value(const QString &key, const QVariant &defaultValue) const
 {
     return d->m_data.value(key, defaultValue);
diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h
index d8864b8ce..ad7ad9e1f 100644
--- a/src/libs/installer/settings.h
+++ b/src/libs/installer/settings.h
@@ -115,6 +115,7 @@ public:
     QStringList certificateFiles() const;
     bool allowNonAsciiCharacters() const;
 
+    bool containsValue(const QString &key) const;
     QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
     QVariantList values(const QString &key, const QVariantList &defaultValue = QVariantList()) const;