feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Daniel Molkentin
2009-02-11 19:41:01 +01:00
parent bcc2a195a3
commit c29a2429b9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -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()
} }
} }
settings->remove(newQtVersionsKey); settings->remove(newQtVersionsKey);
settings->remove(QLatin1String("Installer/")+newQtVersionsKey);
updateUniqueIdToIndexMap(); updateUniqueIdToIndexMap();
} }