Maemo: Enable compilation unconditionally.

src/libs/libs.pro

@@ -10,10 +10,5 @@ SUBDIRS   = \
     utils/process_stub.pro \
     cplusplus \
     qmljs \
-    symbianutils
-
-SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO)
-!isEmpty(SUPPORT_QT_MAEMO) {
-SUBDIRS += 3rdparty
-message("Adding experimental ssh support for Qt/Maemo applications.")
-}
+    symbianutils \
+    3rdparty

src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp

@@ -47,12 +47,9 @@ namespace Internal {
 
 QString homeDirOnDevice(const QString &uname)
 {
-    const QString &dir = uname == QLatin1String("root")
+    return uname == QLatin1String("root")
         ? QString::fromLatin1("/root")
         : QLatin1String("/home/") + uname;
-    qDebug("%s: user name %s is mapped to home dir %s",
-           Q_FUNC_INFO, qPrintable(uname), qPrintable(dir));
-    return dir;
 }
 
 namespace {

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

-SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO)
-!isEmpty(SUPPORT_QT_MAEMO) {
-    message("Adding experimental support for Qt/Maemo applications.")
-    DEFINES += QTCREATOR_WITH_MAEMO
-    INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src
-    INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build
-    LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan)
-    HEADERS += $$PWD/maemorunconfiguration.h \
-        $$PWD/maemomanager.h \
-        $$PWD/maemotoolchain.h \
-        $$PWD/maemodeviceconfigurations.h \
-        $$PWD/maemosettingspage.h \
-        $$PWD/maemosettingswidget.h \
-        $$PWD/maemosshconnection.h \
-        $$PWD/maemosshthread.h \
-        $$PWD/maemoruncontrol.h \
-        $$PWD/maemorunconfigurationwidget.h
-    SOURCES += $$PWD/maemorunconfiguration.cpp \
-        $$PWD/maemomanager.cpp \
-        $$PWD/maemotoolchain.cpp \
-        $$PWD/maemodeviceconfigurations.cpp \
-        $$PWD/maemosettingspage.cpp \
-        $$PWD/maemosettingswidget.cpp \
-        $$PWD/maemosshconnection.cpp \
-        $$PWD/maemosshthread.cpp \
-        $$PWD/maemoruncontrol.cpp \
-        $$PWD/maemorunconfigurationwidget.cpp
-    FORMS += $$PWD/maemosettingswidget.ui
-    RESOURCES += $$PWD/qt-maemo.qrc
-}
+INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build
+INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src
+LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan)
+HEADERS += $$PWD/maemorunconfiguration.h \
+    $$PWD/maemomanager.h \
+    $$PWD/maemotoolchain.h \
+    $$PWD/maemodeviceconfigurations.h \
+    $$PWD/maemosettingspage.h \
+    $$PWD/maemosettingswidget.h \
+    $$PWD/maemosshconnection.h \
+    $$PWD/maemosshthread.h \
+    $$PWD/maemoruncontrol.h \
+    $$PWD/maemorunconfigurationwidget.h
+SOURCES += $$PWD/maemorunconfiguration.cpp \
+    $$PWD/maemomanager.cpp \
+    $$PWD/maemotoolchain.cpp \
+    $$PWD/maemodeviceconfigurations.cpp \
+    $$PWD/maemosettingspage.cpp \
+    $$PWD/maemosettingswidget.cpp \
+    $$PWD/maemosshconnection.cpp \
+    $$PWD/maemosshthread.cpp \
+    $$PWD/maemoruncontrol.cpp \
+    $$PWD/maemorunconfigurationwidget.cpp
+FORMS += $$PWD/maemosettingswidget.ui
+RESOURCES += $$PWD/qt-maemo.qrc

src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp

@@ -47,12 +47,9 @@
 #include "gettingstartedwelcomepage.h"
 #include "gettingstartedwelcomepagewidget.h"
 
+#include "qt-maemo/maemomanager.h"
 #include "qt-s60/s60manager.h"
 
-#ifdef QTCREATOR_WITH_MAEMO
-#    include "qt-maemo/maemomanager.h"
-#endif
-
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
@@ -149,10 +146,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     addAutoReleasedObject(new LinguistExternalEditor);
 
     addAutoReleasedObject(new S60Manager);
-
-#ifdef QTCREATOR_WITH_MAEMO
     addAutoReleasedObject(MaemoManager::instance());
-#endif
 
     new ProFileCacheManager(this);
 

src/plugins/qt4projectmanager/qt4runconfiguration.cpp

@@ -131,17 +131,25 @@ bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configu
 {
     Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(configuration);
     QTC_ASSERT(qt4bc, return false);
-    ProjectExplorer::ToolChain::ToolChainType type = qt4bc->toolChainType();
-    if (type == ProjectExplorer::ToolChain::WINSCW
-        || type == ProjectExplorer::ToolChain::GCCE
-        || type == ProjectExplorer::ToolChain::RVCT_ARMV5
-        || type == ProjectExplorer::ToolChain::RVCT_ARMV6)
-        return false;
-#ifdef QTCREATOR_WITH_MAEMO
-    if (type == ProjectExplorer::ToolChain::GCC_MAEMO)
-        return false;
-#endif
-    return true;
+
+    using namespace ProjectExplorer;
+    ToolChain::ToolChainType type = qt4bc->toolChainType();
+    bool enabled;
+    switch (type) {
+    case ToolChain::MSVC:        case ToolChain::WINCE:
+    case ToolChain::GCC:         case ToolChain::MinGW:
+    case ToolChain::GCCE_GNUPOC: case ToolChain::RVCT_ARMV6_GNUPOC:
+    case ToolChain::OTHER:       case ToolChain::UNKNOWN:
+    case ToolChain::INVALID:
+        enabled = true;
+        break;
+    case ToolChain::WINSCW:      case ToolChain::GCCE:
+    case ToolChain::RVCT_ARMV5:  case ToolChain::RVCT_ARMV6:
+    case ToolChain::GCC_MAEMO:
+        enabled = false;
+        break;
+    }
+    return enabled;
 }
 
 void Qt4RunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -32,10 +32,8 @@
 #include "qt4projectmanagerconstants.h"
 #include "profilereader.h"
 
-#include "qt-s60/s60manager.h"
-#ifdef QTCREATOR_WITH_MAEMO
 #include "qt-maemo/maemomanager.h"
-#endif
+#include "qt-s60/s60manager.h"
 
 #include <projectexplorer/debugginghelper.h>
 #include <projectexplorer/projectexplorer.h>
@@ -1251,11 +1249,9 @@ void QtVersion::updateToolChainAndMkspec() const
                          << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain::RVCT_ARMV6_GNUPOC));
 #    endif
         }
-    } else if (qt_arch == "arm") {
-#ifdef QTCREATOR_WITH_MAEMO
-        if (MaemoManager::instance()->isValidMaemoQtVersion(this))
-            m_toolChains << ToolChainPtr(MaemoManager::instance()->maemoToolChain(this));
-#endif
+    } else if (qt_arch == "arm"
+               && MaemoManager::instance()->isValidMaemoQtVersion(this)) {
+        m_toolChains << ToolChainPtr(MaemoManager::instance()->maemoToolChain(this));
     } else if (qmakeCXX == "cl" || qmakeCXX == "icl") {
         // TODO proper support for intel cl
         m_toolChains << ToolChainPtr(