Commit c29a2429 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Fixes: Play nice with the NSIS installer, accept the Installer hints under a group name, too.

parent bcc2a195
...@@ -241,12 +241,17 @@ void QtVersionManager::addNewVersionsFromInstaller() ...@@ -241,12 +241,17 @@ void QtVersionManager::addNewVersionsFromInstaller()
// or NewQtVersions="qt 4.3.2=c:\\qt\\qt432=c:\\qtcreator\\mingw\\=prependToPath; // 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. // Duplicate entries are not added, the first new version is set as default.
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
if (!settings->contains(newQtVersionsKey))
if (!settings->contains(newQtVersionsKey) &&
!settings->contains(QLatin1String("Installer/")+newQtVersionsKey))
return; return;
// qDebug()<<"QtVersionManager::addNewVersionsFromInstaller()"; // qDebug()<<"QtVersionManager::addNewVersionsFromInstaller()";
QString newVersionsValue = settings->value(newQtVersionsKey).toString(); QString newVersionsValue = settings->value(newQtVersionsKey).toString();
if (newVersionsValue.isEmpty())
newVersionsValue = settings->value(QLatin1String("Installer/")+newQtVersionsKey).toString();
QStringList newVersionsList = newVersionsValue.split(';', QString::SkipEmptyParts); QStringList newVersionsList = newVersionsValue.split(';', QString::SkipEmptyParts);
bool defaultVersionWasReset = false; bool defaultVersionWasReset = false;
foreach (QString newVersion, newVersionsList) { foreach (QString newVersion, newVersionsList) {
...@@ -281,6 +286,7 @@ void QtVersionManager::addNewVersionsFromInstaller() ...@@ -281,6 +286,7 @@ void QtVersionManager::addNewVersionsFromInstaller()
} }
} }
settings->remove(newQtVersionsKey); settings->remove(newQtVersionsKey);
settings->remove(QLatin1String("Installer/")+newQtVersionsKey);
updateUniqueIdToIndexMap(); updateUniqueIdToIndexMap();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment