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, 8 insertions, 5 deletions

diff --git a/src/libs/installer/registertoolchainoperation.cpp b/src/libs/installer/registertoolchainoperation.cpp
index 66190e289..ff088c04a 100644
--- a/src/libs/installer/registertoolchainoperation.cpp
+++ b/src/libs/installer/registertoolchainoperation.cpp
@@ -32,7 +32,6 @@
 
 #include "registertoolchainoperation.h"
 
-#include "constants.h"
 #include "persistentsettings.h"
 #include "packagemanagercore.h"
 #include "qtcreator_constants.h"
@@ -76,8 +75,13 @@ bool RegisterToolChainOperation::performOperation()
         setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
         return false;
     }
-    const QString &rootInstallPath = core->value(scTargetDir);
-    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
+    if (core->value(scQtCreatorInstallerToolchainsFile).isEmpty()) {
+        setError(UserDefinedError);
+        setErrorString(tr("There is no value set for %1 on the installer object.").arg(
+            scQtCreatorInstallerToolchainsFile));
+        return false;
+    }
+    toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile);
 
     QtCreatorToolChain toolChain;
 
@@ -131,8 +135,7 @@ bool RegisterToolChainOperation::undoOperation()
         setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name()));
         return false;
     }
-    const QString &rootInstallPath = core->value(scTargetDir);
-    toolChainsXmlFilePath = rootInstallPath + QLatin1String(ToolChainSettingsSuffixPath);
+    toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile);
 
     QtCreatorToolChain toolChain;