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

Add rvct system include path from environment.

Browse Source
This commit is contained in:
con
2009-08-10 17:36:24 +02:00
parent 28b8eda8b7
commit 4a18ac3484
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,11 @@ QByteArray RVCTToolChain::predefinedMacros()
QList<HeaderPath> RVCTToolChain::systemHeaderPaths() QList<HeaderPath> RVCTToolChain::systemHeaderPaths()
{ {
if (m_systemHeaderPaths.isEmpty()) { if (m_systemHeaderPaths.isEmpty()) {
//TODO system header paths (from environment variables?) updateVersion();
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
QString rvctInclude = env.value(QString::fromLatin1("RVCT%1%2INC").arg(m_major).arg(m_minor));
if (!rvctInclude.isEmpty())
m_systemHeaderPaths.append(HeaderPath(rvctInclude, HeaderPath::GlobalHeaderPath));
m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath)); m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath));
m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include\\stdapis").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath)); m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include\\stdapis").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath));
m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include\\stdapis\\sys").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath)); m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include\\stdapis\\sys").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath));