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

Add setting for GCCE tool chain path.

Browse Source
This commit is contained in:
con
2009-10-29 12:19:56 +01:00
parent 7b117ba975
commit 4fc6a17d94
8 changed files with 65 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,15 +46,16 @@
#include <QtGui/QMainWindow>
namespace {
const char *GCCE_COMMAND = "arm-none-symbianelf-gcc.exe";
const char *S60_AUTODETECTION_SOURCE = "QTS60";
}
namespace Qt4ProjectManager {
namespace Internal {
S60Manager *S60Manager::m_instance = 0;
namespace {
static const char *S60_AUTODETECTION_SOURCE = "QTS60";
}
// ======== Parametrizable Factory for RunControls, depending on the configuration
// class and mode.
@@ -201,7 +202,10 @@ ProjectExplorer::ToolChain *S60Manager::createWINSCWToolChain(const Qt4ProjectMa
ProjectExplorer::ToolChain *S60Manager::createGCCEToolChain(const Qt4ProjectManager::QtVersion *version) const
{
return new GCCEToolChain(deviceForQtVersion(version));
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
env.prependOrSetPath(version->gcceDirectory()+"/bin");
QString gcceCommandPath= env.searchInPath(GCCE_COMMAND);
return new GCCEToolChain(deviceForQtVersion(version), gcceCommandPath);
}
ProjectExplorer::ToolChain *S60Manager::createRVCTToolChain(
@@ -238,5 +242,5 @@ S60Devices::Device S60Manager::deviceForQtVersion(const Qt4ProjectManager::QtVer
return device;
}
}
}
} // namespace internal
} // namespace qt4projectmanager