diff options
| author | con <qtc-committer@nokia.com> | 2009-06-04 10:50:44 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-06-24 13:41:37 +0200 |
| commit | 6b3ef9f8185f12c00f7f67a0c9e3001b14f4e355 (patch) | |
| tree | 3722dcd9d9836ad85c03078a9082765b19ce189b /src/plugins/qt4projectmanager/qt-s60 | |
| parent | 02fb12d74d36187fa1d0f8cca70f7053104a3057 (diff) | |
| download | qt-creator-6b3ef9f8185f12c00f7f67a0c9e3001b14f4e355.tar.gz | |
Parametrize metroworks tools path.
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60')
4 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt index ee6481c066..b7f0d13b75 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt @@ -8,4 +8,5 @@ * WINSCW tool chain: * predefined macros * system includes - * get rid of hardcoded carbide path + +* Run WINSCW executables diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index 283bb76a51..caa78d2eeb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -114,5 +114,5 @@ void S60Manager::updateQtVersions() ProjectExplorer::ToolChain *S60Manager::createWINSCWToolChain(const Qt4ProjectManager::QtVersion *version) const { QString id = version->autodetectionSource().mid(QString(S60_AUTODETECTION_SOURCE).length()+1); - return new WINSCWToolChain(m_devices->deviceForId(id)); + return new WINSCWToolChain(m_devices->deviceForId(id), version->mwcDirectory()); } diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp index b0bad58ac5..6a924b95a6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp @@ -3,9 +3,9 @@ using namespace ProjectExplorer; using namespace Qt4ProjectManager::Internal; -WINSCWToolChain::WINSCWToolChain(S60Devices::Device device) +WINSCWToolChain::WINSCWToolChain(S60Devices::Device device, const QString &mwcDirectory) // TODO get rid of hardcoded carbide path - : m_carbidePath(QLatin1String("C:\\Apps\\Nokia\\Carbide.c++ v2.0")), + : m_carbidePath(mwcDirectory), m_deviceId(device.id), m_deviceName(device.name), m_deviceRoot(device.epocRoot) diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h index 84f4ab9d72..835ac84bec 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h @@ -11,7 +11,7 @@ namespace Internal { class WINSCWToolChain : public ProjectExplorer::ToolChain { public: - WINSCWToolChain(S60Devices::Device device); + WINSCWToolChain(S60Devices::Device device, const QString &mwcDirectory); QByteArray predefinedMacros(); QList<ProjectExplorer::HeaderPath> systemHeaderPaths(); void addToEnvironment(ProjectExplorer::Environment &env); |