From c29a2429b92f12960d025d5e01b5be6e5dff8700 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Wed, 11 Feb 2009 19:41:01 +0100
Subject: [PATCH] Fixes: Play nice with the NSIS installer, accept the
Installer hints under a group name, too.
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 780de4ebc65..f79cc4b5964 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -241,12 +241,17 @@ void QtVersionManager::addNewVersionsFromInstaller()
// or NewQtVersions="qt 4.3.2=c:\\qt\\qt432=c:\\qtcreator\\mingw\\=prependToPath;
// Duplicate entries are not added, the first new version is set as default.
QSettings *settings = Core::ICore::instance()->settings();
- if (!settings->contains(newQtVersionsKey))
+
+ if (!settings->contains(newQtVersionsKey) &&
+ !settings->contains(QLatin1String("Installer/")+newQtVersionsKey))
return;
// qDebug()<<"QtVersionManager::addNewVersionsFromInstaller()";
QString newVersionsValue = settings->value(newQtVersionsKey).toString();
+ if (newVersionsValue.isEmpty())
+ newVersionsValue = settings->value(QLatin1String("Installer/")+newQtVersionsKey).toString();
+
QStringList newVersionsList = newVersionsValue.split(';', QString::SkipEmptyParts);
bool defaultVersionWasReset = false;
foreach (QString newVersion, newVersionsList) {
@@ -281,6 +286,7 @@ void QtVersionManager::addNewVersionsFromInstaller()
}
}
settings->remove(newQtVersionsKey);
+ settings->remove(QLatin1String("Installer/")+newQtVersionsKey);
updateUniqueIdToIndexMap();
}
--
GitLab