Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
ck
2009-10-26 15:53:33 +01:00
151 changed files with 5026 additions and 2462 deletions

View File

@@ -293,7 +293,7 @@ void QtVersionManager::addNewVersionsFromInstaller()
foreach (QString newVersion, newVersionsList) {
QStringList newVersionData = newVersion.split('=');
if (newVersionData.count()>=2) {
if (QDir(newVersionData[1]).exists()) {
if (QFile::exists(newVersionData[1])) {
QtVersion *version = new QtVersion(newVersionData[0], newVersionData[1], m_idcount++ );
if (newVersionData.count() >= 3)
version->setMingwDirectory(newVersionData[2]);