diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-05-24 17:10:58 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-05-25 09:03:49 +0200 |
| commit | b62f1ab053b5ed26b8e883481c6dae5561fad7b6 (patch) | |
| tree | e576da3f6e266633cb9516c79a6027c13df4db0c /src/libs/installer/registerdefaultdebuggeroperation.cpp | |
| parent | fb396036ccf3a0fd75d57c68e1e301b291245371 (diff) | |
add a fallback for alreadys installed installations
Change-Id: Ib7dd955cb89e307d557b7a4706a885c031d6289f
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'src/libs/installer/registerdefaultdebuggeroperation.cpp')
| -rw-r--r-- | src/libs/installer/registerdefaultdebuggeroperation.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/libs/installer/registerdefaultdebuggeroperation.cpp b/src/libs/installer/registerdefaultdebuggeroperation.cpp index b9a790757..3b8c97250 100644 --- a/src/libs/installer/registerdefaultdebuggeroperation.cpp +++ b/src/libs/installer/registerdefaultdebuggeroperation.cpp @@ -130,15 +130,23 @@ bool RegisterDefaultDebuggerOperation::undoOperation() return false; } - QString toolChainsXmlFilePath; - PackageManagerCore *const core = qVariantValue<PackageManagerCore *>(value(QLatin1String("installer"))); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); return false; } - toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile); + + // default value is the old value to keep the possibility that old saved operations can run undo +#ifdef Q_OS_MAC + QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/toolChains.xml").arg( + core->value(QLatin1String("TargetDir")))); +#else + QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, + QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/toolChains.xml").arg(core->value( + QLatin1String("TargetDir")))); +#endif int argCounter = 0; const QString &abiString = args.at(argCounter++); //for example x86-windows-msys-pe-32bit |