now the qt creator releated locations are more flexible

 - tried to remove or move  Qt/Qt Creator related things from the core classes

Change-Id: I168ae3c56785e389ac34b761be98a7782a683de7
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>

1 files changed, 14 insertions, 6 deletions

diff --git a/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp b/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp
index edf4b2fab..9172f2b89 100644
--- a/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp
+++ b/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp
@@ -32,7 +32,6 @@
 
 #include "updatecreatorsettingsfrom21to22operation.h"
 
-#include "constants.h"
 #include "registerdefaultdebuggeroperation.h"
 #include "registertoolchainoperation.h"
 #include "qtcreatorpersistentsettings.h"
@@ -288,12 +287,21 @@ bool UpdateCreatorSettingsFrom21To22Operation::performOperation()
         setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name()));
         return false;
     }
-    const QString &rootInstallPath = core->value(scTargetDir);
 
-    QString toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
-
-    QSettings sdkSettings(rootInstallPath + QLatin1String(QtCreatorSettingsSuffixPath),
-        QSettings::IniFormat);
+    if (core->value(scQtCreatorInstallerToolchainsFile).isEmpty()) {
+        setError(UserDefinedError);
+        setErrorString(tr("There is no value set for %1 on the installer object.").arg(
+            scQtCreatorInstallerToolchainsFile));
+        return false;
+    }
+    QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile);
+    if (core->value(scQtCreatorInstallerSettingsFile).isEmpty()) {
+        setError(UserDefinedError);
+        setErrorString(tr("There is no value set for %1 on the installer object.").arg(
+            scQtCreatorInstallerSettingsFile));
+        return false;
+    }
+    QSettings sdkSettings(core->value(scQtCreatorInstallerSettingsFile), QSettings::IniFormat);
 
     convertDefaultGDBInstallerSettings(sdkSettings, core);