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

Symbian: Introduce RVCT 4 toolchain

Browse Source 
Task-number: 2481
This commit is contained in:
Tobias Hunger
2010-11-26 12:17:14 +01:00
parent 2e09df3d9c
commit 7169bfff39
11 changed files with 271 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
View File

@@ -141,9 +141,14 @@ S60Manager::~S60Manager()
}
}
bool S60Manager::hasRvctCompiler()
bool S60Manager::hasRvct2Compiler()
{
return !RVCTToolChain::rvctBinEnvironmentVariable().isEmpty();
return RVCT2ToolChain::configuredRvctVersions().contains(qMakePair(2, 2));
}
bool S60Manager::hasRvct4Compiler()
{
return RVCT2ToolChain::configuredRvctVersions().contains(qMakePair(2, 2));
}
void S60Manager::addAutoReleasedObject(QObject *o)
@@ -237,7 +242,14 @@ ProjectExplorer::ToolChain *S60Manager::createRVCTToolChain(
ProjectExplorer::ToolChainType type) const
{
Q_ASSERT(version);
return new RVCTToolChain(deviceForQtVersion(version), type);
if (type == ProjectExplorer::ToolChain_RVCT2_ARMV5
|| type == ProjectExplorer::ToolChain_RVCT2_ARMV6
|| type == ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC)
return new RVCT2ToolChain(deviceForQtVersion(version), type);
if (type == ProjectExplorer::ToolChain_RVCT4_ARMV5
|| type == ProjectExplorer::ToolChain_RVCT4_ARMV6)
return new RVCT4ToolChain(deviceForQtVersion(version), type);
return 0;
}
S60Devices::Device S60Manager::deviceForQtVersion(const Qt4ProjectManager::QtVersion *version) const