Commit ff751333 authored by Tobias Hunger's avatar Tobias Hunger

Qt: Make sure to import non-native pathes from ini

Make sure to not import non-native pathes from our settings
(from old versions of Qt Creator). We make sure to use only
proper slashes nowadays.

Task-number: QTCREATORBUG-4328
Reviewed-by: dt
parent 1f445b2d
......@@ -173,8 +173,9 @@ QtVersionManager::QtVersionManager()
id,
isAutodetected,
autodetectionSource);
version->setSystemRoot(s->value("S60SDKDirectory").toString());
version->setSbsV2Directory(s->value(QLatin1String("SBSv2Directory")).toString());
// Make sure we do not import non-native separators from old Qt Creator versions:
version->setSystemRoot(QDir::fromNativeSeparators(s->value("S60SDKDirectory").toString()));
version->setSbsV2Directory(QDir::fromNativeSeparators(s->value(QLatin1String("SBSv2Directory")).toString()));
// Update from pre-2.2:
const QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString();
......
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