Implement configuration interface.

Task-number: QTIFW-196

Change-Id: I87724252ae4860c2fadc12786c6e588d9c45332f
Reviewed-by: Niels Weber <niels.weber@digia.com>

2 files changed, 23 insertions, 1 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 9722a9200..b1f0dd511 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -60,7 +60,6 @@
 #include "kdupdaterfiledownloaderfactory.h"
 #include "kdupdaterupdatesourcesinfo.h"
 #include "kdupdaterupdateoperationfactory.h"
-#include "kdupdaterupdatefinder.h"
 
 #include <productkeycheck.h>
 
@@ -203,6 +202,7 @@ static void deferredRename(const QString &oldName, const QString &newName, bool
 
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
     : m_updateFinder(0)
+    , m_updaterApplication(new DummyConfigurationInterface)
     , m_FSEngineClientHandler(0)
     , m_core(core)
     , m_repoMetaInfoJob(0)
@@ -220,6 +220,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
         const OperationList &performedOperations)
     : m_updateFinder(0)
+    , m_updaterApplication(new DummyConfigurationInterface)
     , m_FSEngineClientHandler(initFSEngineClientHandler())
     , m_status(PackageManagerCore::Unfinished)
     , m_forceRestart(false)
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 80815c252..839497385 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -50,6 +50,7 @@
 #include "kdsysinfo.h"
 #include "kdupdaterapplication.h"
 #include "kdupdaterfiledownloaderfactory.h"
+#include "kdupdaterupdatefinder.h"
 
 #include <QObject>
 
@@ -69,6 +70,26 @@ class ScriptEngine;
 class ComponentModel;
 class TempDirDeleter;
 
+/*
+    The default configuration interface implementation does call QSettings to save files for later deletion,
+    though according to QSettings there should nothing be written if QSettings is not setup properly (which
+    we do not in our case). Still, caused by a broken QSettings implementation at least on Linux we write an
+    empty config file which resulted in QTIFW-196. To workaround the issue we now use this empty dummy class.
+*/
+class DummyConfigurationInterface : public KDUpdater::ConfigurationInterface
+{
+public:
+    QVariant value(const QString &key) const
+    {
+        Q_UNUSED(key)
+        return QVariant();
+    }
+    void setValue(const QString &key, const QVariant &value)
+    {
+        qDebug() << "DummyConfigurationInterface called with key:" << key << "and value:" << value;
+    }
+};
+
 class PackageManagerCorePrivate : public QObject
 {
     Q_OBJECT