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

Symbian SDK path should be editable for Qt in PATH.

Browse Source 
Reviewed-by: Robert Loehning
This commit is contained in:
con
2009-11-04 19:14:17 +01:00
parent d2bd092b47
commit d8b2598f4f
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qtoptionspage.cpp
View File

@@ -399,7 +399,9 @@ void QtOptionsPageWidget::updateState()
m_ui->qmakePath->setEnabled(enabled && !isAutodetected); m_ui->qmakePath->setEnabled(enabled && !isAutodetected);
m_ui->mingwPath->setEnabled(enabled); m_ui->mingwPath->setEnabled(enabled);
m_ui->mwcPath->setEnabled(enabled); m_ui->mwcPath->setEnabled(enabled);
m_ui->s60SDKPath->setEnabled(enabled && !isAutodetected); bool s60SDKPathEnabled = enabled &&
(isAutodetected ? version->s60SDKDirectory().isEmpty() : true);
m_ui->s60SDKPath->setEnabled(s60SDKPathEnabled);
m_ui->gccePath->setEnabled(enabled); m_ui->gccePath->setEnabled(enabled);
const bool hasLog = enabled && !m_ui->qtdirList->currentItem()->data(2, Qt::UserRole).toString().isEmpty(); const bool hasLog = enabled && !m_ui->qtdirList->currentItem()->data(2, Qt::UserRole).toString().isEmpty();

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

@@ -125,11 +125,9 @@ QtVersionManager::QtVersionManager()
autodetectionSource); autodetectionSource);
version->setMingwDirectory(s->value("MingwDirectory").toString()); version->setMingwDirectory(s->value("MingwDirectory").toString());
version->setMsvcVersion(s->value("msvcVersion").toString()); version->setMsvcVersion(s->value("msvcVersion").toString());
#ifdef QTCREATOR_WITH_S60
version->setMwcDirectory(s->value("MwcDirectory").toString()); version->setMwcDirectory(s->value("MwcDirectory").toString());
version->setS60SDKDirectory(s->value("S60SDKDirectory").toString()); version->setS60SDKDirectory(s->value("S60SDKDirectory").toString());
version->setGcceDirectory(s->value("GcceDirectory").toString()); version->setGcceDirectory(s->value("GcceDirectory").toString());
#endif
m_versions.append(version); m_versions.append(version);
} }
s->endArray(); s->endArray();
@@ -263,11 +261,9 @@ void QtVersionManager::writeVersionsIntoSettings()
s->setValue("isAutodetected", version->isAutodetected()); s->setValue("isAutodetected", version->isAutodetected());
if (version->isAutodetected()) if (version->isAutodetected())
s->setValue("autodetectionSource", version->autodetectionSource()); s->setValue("autodetectionSource", version->autodetectionSource());
#ifdef QTCREATOR_WITH_S60
s->setValue("MwcDirectory", version->mwcDirectory()); s->setValue("MwcDirectory", version->mwcDirectory());
s->setValue("S60SDKDirectory", version->s60SDKDirectory()); s->setValue("S60SDKDirectory", version->s60SDKDirectory());
s->setValue("GcceDirectory", version->gcceDirectory()); s->setValue("GcceDirectory", version->gcceDirectory());
#endif
} }
s->endArray(); s->endArray();
} }
@@ -1218,7 +1214,6 @@ ProjectExplorer::ToolChain::ToolChainType QtVersion::defaultToolchainType() cons
return possibleToolChainTypes().at(0); return possibleToolChainTypes().at(0);
} }
#ifdef QTCREATOR_WITH_S60
QString QtVersion::mwcDirectory() const QString QtVersion::mwcDirectory() const
{ {
return m_mwcDirectory; return m_mwcDirectory;
@@ -1247,7 +1242,6 @@ void QtVersion::setGcceDirectory(const QString &directory)
{ {
m_gcceDirectory = directory; m_gcceDirectory = directory;
} }
#endif
QString QtVersion::mingwDirectory() const QString QtVersion::mingwDirectory() const
{ {

6
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -83,14 +83,13 @@ public:
// Returns the PREFIX, BINPREFIX, DOCPREFIX and similar information // Returns the PREFIX, BINPREFIX, DOCPREFIX and similar information
QHash<QString,QString> versionInfo() const; QHash<QString,QString> versionInfo() const;
#ifdef QTCREATOR_WITH_S60
QString mwcDirectory() const; QString mwcDirectory() const;
void setMwcDirectory(const QString &directory); void setMwcDirectory(const QString &directory);
QString s60SDKDirectory() const; QString s60SDKDirectory() const;
void setS60SDKDirectory(const QString &directory); void setS60SDKDirectory(const QString &directory);
QString gcceDirectory() const; QString gcceDirectory() const;
void setGcceDirectory(const QString &directory); void setGcceDirectory(const QString &directory);
#endif
QString mingwDirectory() const; QString mingwDirectory() const;
void setMingwDirectory(const QString &directory); void setMingwDirectory(const QString &directory);
QString msvcVersion() const; QString msvcVersion() const;
@@ -146,11 +145,10 @@ private:
bool m_isAutodetected; bool m_isAutodetected;
QString m_autodetectionSource; QString m_autodetectionSource;
bool m_hasDebuggingHelper; bool m_hasDebuggingHelper;
#ifdef QTCREATOR_WITH_S60
QString m_mwcDirectory; QString m_mwcDirectory;
QString m_s60SDKDirectory; QString m_s60SDKDirectory;
QString m_gcceDirectory; QString m_gcceDirectory;
#endif
mutable bool m_mkspecUpToDate; mutable bool m_mkspecUpToDate;
mutable QString m_mkspec; // updated lazily mutable QString m_mkspec; // updated lazily