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

Compile fix

Browse Source
This commit is contained in:
Tobias Hunger
2010-11-26 15:23:25 +01:00
parent 0ad583f3e7
commit 283af9d5ce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -348,8 +348,8 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
return QString(); return QString();
return executableFromPackageUnix(ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg")); return executableFromPackageUnix(ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"));
} }
case ProjectExplorer::ToolChain_RVCT_ARMV5: case ProjectExplorer::ToolChain_RVCT2_ARMV5:
case ProjectExplorer::ToolChain_RVCT_ARMV6: case ProjectExplorer::ToolChain_RVCT2_ARMV6:
return localExecutableFromDevice(qtVersion(), symbianTarget(), targetName(), toolChain); return localExecutableFromDevice(qtVersion(), symbianTarget(), targetName(), toolChain);
break; break;
case ProjectExplorer::ToolChain_GCCE: { case ProjectExplorer::ToolChain_GCCE: {
@@ -357,7 +357,7 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
const QtVersion *qtv = qtVersion(); const QtVersion *qtv = qtVersion();
QTC_ASSERT(qtv, return QString(); ) QTC_ASSERT(qtv, return QString(); )
return qtv->isBuildWithSymbianSbsV2() ? return qtv->isBuildWithSymbianSbsV2() ?
localExecutableFromDevice(qtv, symbianTarget(), targetName(), ProjectExplorer::ToolChain_RVCT_ARMV5) : localExecutableFromDevice(qtv, symbianTarget(), targetName(), ProjectExplorer::ToolChain_RVCT2_ARMV5) :
localExecutableFromDevice(qtv, symbianTarget(), targetName(), toolChain); localExecutableFromDevice(qtv, symbianTarget(), targetName(), toolChain);
} }
break; break;

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

@@ -1440,7 +1440,7 @@ void QtVersion::updateToolChainAndMkspec() const
} }
# else # else
if (S60Manager::hasRvctCompiler()) if (S60Manager::hasRvctCompiler())
m_toolChains << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC)); m_toolChains << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT2_ARMV5_GNUPOC));
m_toolChains << ToolChainPtr(s60mgr->createGCCE_GnuPocToolChain(this)); m_toolChains << ToolChainPtr(s60mgr->createGCCE_GnuPocToolChain(this));
m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID)); m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
# endif # endif