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

Mostly remove the special define for Symbian support.

Browse Source 
The only part that is not done if not on Windows (or explicitly
specified) is the adding of the preference pane.
This commit is contained in:
con
2009-12-17 18:01:41 +01:00
parent 599d4aa355
commit a54205c3a0
9 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));