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

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

Browse Source 
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
This commit is contained in:
Tobias Hunger
2011-04-01 17:13:03 +02:00
parent 1f445b2dff
commit ff75133381
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,8 +173,9 @@ QtVersionManager::QtVersionManager()
id, id,
isAutodetected, isAutodetected,
autodetectionSource); autodetectionSource);
version->setSystemRoot(s->value("S60SDKDirectory").toString()); // Make sure we do not import non-native separators from old Qt Creator versions:
version->setSbsV2Directory(s->value(QLatin1String("SBSv2Directory")).toString()); version->setSystemRoot(QDir::fromNativeSeparators(s->value("S60SDKDirectory").toString()));
version->setSbsV2Directory(QDir::fromNativeSeparators(s->value(QLatin1String("SBSv2Directory")).toString()));
// Update from pre-2.2: // Update from pre-2.2:
const QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString(); const QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString();