Mostly remove the special define for Symbian support.

The only part that is not done if not on Windows (or explicitly
specified) is the adding of the preference pane.

src/plugins/debugger/gdb/gdb.pri

 include(../../../shared/trk/trk.pri)
 
-!isEmpty(SUPPORT_QT_S60) {
-    message("Adding experimental support for Qt/S60 applications.")
-    DEFINES += QTCREATOR_WITH_S60
-}
-
 HEADERS += \
     $$PWD/gdbmi.h \
     $$PWD/gdbengine.h \

src/plugins/qt4projectmanager/qt-s60/qt-s60.pri

 !isEmpty(SUPPORT_QT_S60) { 
     message("Adding experimental support for Qt/S60 applications.")
     DEFINES += QTCREATOR_WITH_S60
-    SOURCES += $$PWD/s60devices.cpp \
-        $$PWD/s60devicespreferencepane.cpp \
-        $$PWD/s60manager.cpp \
-        $$PWD/winscwtoolchain.cpp \
-        $$PWD/gccetoolchain.cpp \
-        $$PWD/s60emulatorrunconfiguration.cpp \
-        $$PWD/s60devicerunconfiguration.cpp \
-        $$PWD/s60devicerunconfigurationwidget.cpp \
-        $$PWD/serialdevicelister.cpp \
-        $$PWD/rvcttoolchain.cpp \
-        $$PWD/s60runconfigbluetoothstarter.cpp \
-        $$PWD/abldparser.cpp \
-        $$PWD/rvctparser.cpp \
-        $$PWD/winscwparser.cpp
-    HEADERS += $$PWD/s60devices.h \
-        $$PWD/s60devicespreferencepane.h \
-        $$PWD/s60manager.h \
-        $$PWD/winscwtoolchain.h \
-        $$PWD/gccetoolchain.h \
-        $$PWD/s60emulatorrunconfiguration.h \
-        $$PWD/s60devicerunconfiguration.h \
-        $$PWD/s60devicerunconfigurationwidget.h \
-        $$PWD/serialdevicelister.h \
-        $$PWD/rvcttoolchain.h \
-        $$PWD/s60runconfigbluetoothstarter.h \
-        $$PWD/abldparser.h \
-        $$PWD/rvctparser.h \
-        $$PWD/winscwparser.h
-    FORMS += $$PWD/s60devicespreferencepane.ui
-    OTHER_FILES += $$PWD/qt-s60-todo.txt
-    include(../../../shared/trk/trk.pri)||error("could not include trk.pri")
 }
+SOURCES += $$PWD/s60devices.cpp \
+    $$PWD/s60devicespreferencepane.cpp \
+    $$PWD/s60manager.cpp \
+    $$PWD/winscwtoolchain.cpp \
+    $$PWD/gccetoolchain.cpp \
+    $$PWD/s60emulatorrunconfiguration.cpp \
+    $$PWD/s60devicerunconfiguration.cpp \
+    $$PWD/s60devicerunconfigurationwidget.cpp \
+    $$PWD/serialdevicelister.cpp \
+    $$PWD/rvcttoolchain.cpp \
+    $$PWD/s60runconfigbluetoothstarter.cpp \
+    $$PWD/abldparser.cpp \
+    $$PWD/rvctparser.cpp \
+    $$PWD/winscwparser.cpp
+HEADERS += $$PWD/s60devices.h \
+    $$PWD/s60devicespreferencepane.h \
+    $$PWD/s60manager.h \
+    $$PWD/winscwtoolchain.h \
+    $$PWD/gccetoolchain.h \
+    $$PWD/s60emulatorrunconfiguration.h \
+    $$PWD/s60devicerunconfiguration.h \
+    $$PWD/s60devicerunconfigurationwidget.h \
+    $$PWD/serialdevicelister.h \
+    $$PWD/rvcttoolchain.h \
+    $$PWD/s60runconfigbluetoothstarter.h \
+    $$PWD/abldparser.h \
+    $$PWD/rvctparser.h \
+    $$PWD/winscwparser.h
+FORMS += $$PWD/s60devicespreferencepane.ui
+include(../../../shared/trk/trk.pri)||error("could not include trk.pri")

src/plugins/qt4projectmanager/qt-s60/s60manager.cpp

@@ -102,10 +102,11 @@ S60Manager::S60Manager(QObject *parent)
         m_serialDeviceLister(new SerialDeviceLister(this))
 {
     m_instance = this;
- 
+#ifdef QTCREATOR_WITH_S60
     addAutoReleasedObject(new S60DevicesPreferencePane(m_devices, this));
+#endif
     m_devices->detectQtForDevices(); // Order!
-  
+
     addAutoReleasedObject(new S60EmulatorRunConfigurationFactory(this));
     addAutoReleasedObject(new RunControlFactory<S60EmulatorRunControl,
                                                 S60EmulatorRunConfiguration>

src/plugins/qt4projectmanager/qt4buildconfiguration.cpp

@@ -215,7 +215,6 @@ QString Qt4BuildConfiguration::makeCommand() const
     return tc ? tc->makeCommand() : "make";
 }
 
-#ifdef QTCREATOR_WITH_S60
 static inline QString symbianMakeTarget(QtVersion::QmakeBuildConfigs buildConfig,
                                         const QString &type)
 {
@@ -224,11 +223,9 @@ static inline QString symbianMakeTarget(QtVersion::QmakeBuildConfigs buildConfig
     rc += type;
     return rc;
 }
-#endif
 
 QString Qt4BuildConfiguration::defaultMakeTarget() const
 {
-#ifdef QTCREATOR_WITH_S60
     ToolChain *tc = toolChain();
     if (!tc)
         return QString::null;
@@ -246,9 +243,6 @@ QString Qt4BuildConfiguration::defaultMakeTarget() const
     default:
         break;
     }
-#else
-
-#endif
     return QString::null;
 }
 

src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp

@@ -47,9 +47,7 @@
 #include "gettingstartedwelcomepage.h"
 #include "gettingstartedwelcomepagewidget.h"
 
-#ifdef QTCREATOR_WITH_S60
-#    include "qt-s60/s60manager.h"
-#endif
+#include "qt-s60/s60manager.h"
 
 #ifdef QTCREATOR_WITH_MAEMO
 #    include "qt-maemo/maemomanager.h"
@@ -148,9 +146,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
 #endif
     addAutoReleasedObject(new LinguistExternalEditor);
 
-#ifdef QTCREATOR_WITH_S60
     addAutoReleasedObject(new S60Manager);
-#endif
 
 #ifdef QTCREATOR_WITH_MAEMO
     addAutoReleasedObject(MaemoManager::instance());

src/plugins/qt4projectmanager/qt4runconfiguration.cpp

@@ -98,23 +98,17 @@ QString Qt4RunConfiguration::type() const
 
 bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
 {
-#if defined(QTCREATOR_WITH_S60) || defined(QTCREATOR_WITH_MAEMO)
     Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(configuration);
     QTC_ASSERT(qt4bc, return false);
     ProjectExplorer::ToolChain::ToolChainType type = qt4bc->toolChainType();
-#ifdef QTCREATOR_WITH_S60
     if (type == ProjectExplorer::ToolChain::WINSCW
         || type == ProjectExplorer::ToolChain::GCCE
         || type == ProjectExplorer::ToolChain::RVCT_ARMV5
         || type == ProjectExplorer::ToolChain::RVCT_ARMV6)
         return false;
-#endif
 #ifdef QTCREATOR_WITH_MAEMO
     if (type == ProjectExplorer::ToolChain::GCC_MAEMO)
         return false;
-#endif
-#else
-    Q_UNUSED(configuration);
 #endif
     return true;
 }

src/plugins/qt4projectmanager/qtoptionspage.cpp

@@ -173,14 +173,12 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
             this, SLOT(updateCurrentQMakeLocation()));
     connect(m_ui->mingwPath, SIGNAL(changed(QString)),
             this, SLOT(updateCurrentMingwDirectory()));
-#ifdef QTCREATOR_WITH_S60
     connect(m_ui->mwcPath, SIGNAL(changed(QString)),
             this, SLOT(updateCurrentMwcDirectory()));
     connect(m_ui->s60SDKPath, SIGNAL(changed(QString)),
             this, SLOT(updateCurrentS60SDKDirectory()));
     connect(m_ui->gccePath, SIGNAL(changed(QString)),
             this, SLOT(updateCurrentGcceDirectory()));
-#endif
 
     connect(m_ui->addButton, SIGNAL(clicked()),
             this, SLOT(addQtDir()));
@@ -472,7 +470,6 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
                  }
                  m_ui->msvcComboBox->blockSignals(block);
             }
-#ifdef QTCREATOR_WITH_S60
         } else if (types.contains(ProjectExplorer::ToolChain::WINSCW)
                 || types.contains(ProjectExplorer::ToolChain::RVCT_ARMV5)
                 || types.contains(ProjectExplorer::ToolChain::RVCT_ARMV6)
@@ -483,7 +480,6 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
             m_ui->mwcPath->setPath(m_versions.at(index)->mwcDirectory());
             m_ui->s60SDKPath->setPath(m_versions.at(index)->s60SDKDirectory());
             m_ui->gccePath->setPath(m_versions.at(index)->gcceDirectory());
-#endif
         } else if (types.contains(ProjectExplorer::ToolChain::INVALID)) {
             makeMSVCVisible(false);
             makeMingwVisible(false);
@@ -690,7 +686,6 @@ void QtOptionsPageWidget::msvcVersionChanged()
     m_versions[currentItemIndex]->setMsvcVersion(msvcVersion);
 }
 
-#ifdef QTCREATOR_WITH_S60
 void QtOptionsPageWidget::updateCurrentMwcDirectory()
 {
     QTreeWidgetItem *currentItem = m_ui->qtdirList->currentItem();
@@ -718,7 +713,6 @@ void QtOptionsPageWidget::updateCurrentGcceDirectory()
         return;
     m_versions[currentItemIndex]->setGcceDirectory(m_ui->gccePath->path());
 }
-#endif
 
 QList<QSharedPointerQtVersion> QtOptionsPageWidget::versions() const
 {

src/plugins/qt4projectmanager/qtoptionspage.h

@@ -119,11 +119,9 @@ private slots:
     void updateCurrentQtName();
     void updateCurrentQMakeLocation();
     void updateCurrentMingwDirectory();
-#ifdef QTCREATOR_WITH_S60
     void updateCurrentMwcDirectory();
     void updateCurrentS60SDKDirectory();
     void updateCurrentGcceDirectory();
-#endif
     void msvcVersionChanged();
     void buildDebuggingHelper();
     void showDebuggingBuildLog();

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -32,9 +32,7 @@
 #include "qt4projectmanagerconstants.h"
 #include "profilereader.h"
 
-#ifdef QTCREATOR_WITH_S60
 #include "qt-s60/s60manager.h"
-#endif
 #ifdef QTCREATOR_WITH_MAEMO
 #include "qt-maemo/maemomanager.h"
 #endif
@@ -1225,7 +1223,6 @@ void QtVersion::updateToolChainAndMkspec() const
         m_toolChains << ToolChainPtr(ProjectExplorer::ToolChain::createWinCEToolChain(msvcVersion(), wincePlatformName));
     } else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") ||
                makefileGenerator == QLatin1String("SYMBIAN_SBSV2")) {
-#ifdef QTCREATOR_WITH_S60
         if (S60Manager *s60mgr = S60Manager::instance()) {
 #    ifdef Q_OS_WIN
             m_toolChains << ToolChainPtr(s60mgr->createGCCEToolChain(this))
@@ -1237,7 +1234,6 @@ void QtVersion::updateToolChainAndMkspec() const
                          << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain::RVCT_ARMV6_GNUPOC));
 #    endif
         }
-#endif
     } else if (qt_arch == "arm") {
 #ifdef QTCREATOR_WITH_MAEMO
         m_toolChains << ToolChainPtr(MaemoManager::instance()->maemoToolChain(this));