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

Merge branch '2.2'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
This commit is contained in:
Bill King
2011-04-05 16:43:24 +02:00
parent 8e5ab20898 fc05015226
commit 5e372a165f
67 changed files with 8640 additions and 4721 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,
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();