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

Maemo: Enable compilation unconditionally.

Browse Source
This commit is contained in:
ck
2010-02-08 17:51:58 +01:00
parent 1fa20b3838
commit a40a3d84d5
6 changed files with 52 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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