forked from qt-creator/qt-creator
Symbian SDK path should be editable for Qt in PATH.
Reviewed-by: Robert Loehning
This commit is contained in:
@@ -125,11 +125,9 @@ QtVersionManager::QtVersionManager()
|
||||
autodetectionSource);
|
||||
version->setMingwDirectory(s->value("MingwDirectory").toString());
|
||||
version->setMsvcVersion(s->value("msvcVersion").toString());
|
||||
#ifdef QTCREATOR_WITH_S60
|
||||
version->setMwcDirectory(s->value("MwcDirectory").toString());
|
||||
version->setS60SDKDirectory(s->value("S60SDKDirectory").toString());
|
||||
version->setGcceDirectory(s->value("GcceDirectory").toString());
|
||||
#endif
|
||||
m_versions.append(version);
|
||||
}
|
||||
s->endArray();
|
||||
@@ -263,11 +261,9 @@ void QtVersionManager::writeVersionsIntoSettings()
|
||||
s->setValue("isAutodetected", version->isAutodetected());
|
||||
if (version->isAutodetected())
|
||||
s->setValue("autodetectionSource", version->autodetectionSource());
|
||||
#ifdef QTCREATOR_WITH_S60
|
||||
s->setValue("MwcDirectory", version->mwcDirectory());
|
||||
s->setValue("S60SDKDirectory", version->s60SDKDirectory());
|
||||
s->setValue("GcceDirectory", version->gcceDirectory());
|
||||
#endif
|
||||
}
|
||||
s->endArray();
|
||||
}
|
||||
@@ -1218,7 +1214,6 @@ ProjectExplorer::ToolChain::ToolChainType QtVersion::defaultToolchainType() cons
|
||||
return possibleToolChainTypes().at(0);
|
||||
}
|
||||
|
||||
#ifdef QTCREATOR_WITH_S60
|
||||
QString QtVersion::mwcDirectory() const
|
||||
{
|
||||
return m_mwcDirectory;
|
||||
@@ -1247,7 +1242,6 @@ void QtVersion::setGcceDirectory(const QString &directory)
|
||||
{
|
||||
m_gcceDirectory = directory;
|
||||
}
|
||||
#endif
|
||||
|
||||
QString QtVersion::mingwDirectory() const
|
||||
{
|
||||
|
Reference in New Issue
Block a user