From dfc9887310118de98146f1a7282198f89fae8c18 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 16 May 2012 12:11:25 +0200 Subject: 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 Reviewed-by: Niels Weber --- src/libs/installer/registerqtv2operation.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/libs/installer/registerqtv2operation.cpp') diff --git a/src/libs/installer/registerqtv2operation.cpp b/src/libs/installer/registerqtv2operation.cpp index 1209e52b9..618fbd83f 100644 --- a/src/libs/installer/registerqtv2operation.cpp +++ b/src/libs/installer/registerqtv2operation.cpp @@ -32,7 +32,6 @@ #include "registerqtv2operation.h" -#include "constants.h" #include "packagemanagercore.h" #include "qtcreator_constants.h" @@ -71,12 +70,6 @@ bool RegisterQtInCreatorV2Operation::performOperation() setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); return false; } - const QString &rootInstallPath = core->value(scTargetDir); - if (rootInstallPath.isEmpty() || !QDir(rootInstallPath).exists()) { - setError(UserDefinedError); - setErrorString(tr("The given TargetDir %1 is not a valid/existing dir.").arg(rootInstallPath)); - return false; - } int argCounter = 0; const QString &versionName = args.value(argCounter++); @@ -96,8 +89,13 @@ bool RegisterQtInCreatorV2Operation::performOperation() const QString &systemRoot = QDir::toNativeSeparators(args.value(argCounter++)); //Symbian SDK root for example const QString &sbsPath = QDir::toNativeSeparators(args.value(argCounter++)); - QSettings settings(rootInstallPath + QLatin1String(QtCreatorSettingsSuffixPath), - QSettings::IniFormat); + 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 settings(core->value(scQtCreatorInstallerSettingsFile), QSettings::IniFormat); QString newVersions; QStringList oldNewQtVersions = settings.value(QLatin1String("NewQtVersions") @@ -147,7 +145,6 @@ bool RegisterQtInCreatorV2Operation::undoOperation() setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); return false; } - const QString &rootInstallPath = core->value(scTargetDir); int argCounter = 0; const QString &versionName = args.value(argCounter++); @@ -164,8 +161,7 @@ bool RegisterQtInCreatorV2Operation::undoOperation() } qmakePath = QDir::toNativeSeparators(qmakePath); - QSettings settings(rootInstallPath + QLatin1String(QtCreatorSettingsSuffixPath), - QSettings::IniFormat); + QSettings settings(core->value(scQtCreatorInstallerSettingsFile), QSettings::IniFormat); QString newVersions; QStringList oldNewQtVersions = settings.value(QLatin1String("NewQtVersions") -- cgit v1.2.3