From 4a18ac34847c131b79853c32c291948af83dc90f Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 10 Aug 2009 17:36:24 +0200
Subject: [PATCH] Add rvct system include path from environment.
---
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index c19ea55fddf..fe13e1dca74 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -106,7 +106,11 @@ QByteArray RVCTToolChain::predefinedMacros()
QList<HeaderPath> RVCTToolChain::systemHeaderPaths()
{
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\\stdapis").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath));
m_systemHeaderPaths.append(HeaderPath(QString("%1\\epoc32\\include\\stdapis\\sys").arg(m_deviceRoot), HeaderPath::GlobalHeaderPath));
--
GitLab