Symbian SDK path should be editable for Qt in PATH.

Reviewed-by: Robert Loehning

src/plugins/qt4projectmanager/qtoptionspage.cpp

@@ -399,7 +399,9 @@ void QtOptionsPageWidget::updateState()
     m_ui->qmakePath->setEnabled(enabled && !isAutodetected);
     m_ui->mingwPath->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);
 
     const bool hasLog = enabled && !m_ui->qtdirList->currentItem()->data(2, Qt::UserRole).toString().isEmpty();

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -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
 {

src/plugins/qt4projectmanager/qtversionmanager.h

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