System includes for winscw tool chain.

src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt

@@ -15,9 +15,11 @@
       of ToolChain::defaultMakeTarget then as well
     * build parser should be defined/created by toolchain, not make step
 
+* Tool chains:
+    * changing tool chain does not reindex (changed includes+defines)
+
 * WINSCW tool chain:
     * predefined macros
-    * system includes
 
 * Run WINSCW executables
 * Deploy gcce executables

src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp

@@ -25,11 +25,15 @@ QByteArray WINSCWToolChain::predefinedMacros()
 
 QList<HeaderPath> WINSCWToolChain::systemHeaderPaths()
 {
-    // TODO
+    if (m_systemHeaderPaths.isEmpty()) {
+        foreach (const QString &value, systemIncludes()) {
+            m_systemHeaderPaths.append(HeaderPath(value, HeaderPath::GlobalHeaderPath));
+        }
+    }
     return m_systemHeaderPaths;
 }
 
-void WINSCWToolChain::addToEnvironment(ProjectExplorer::Environment &env)
+QStringList WINSCWToolChain::systemIncludes() const
 {
     QStringList symIncludes = QStringList()
         << "\\MSL\\MSL_C\\MSL_Common\\Include"
@@ -41,7 +45,12 @@ void WINSCWToolChain::addToEnvironment(ProjectExplorer::Environment &env)
         << "\\Win32-x86 Support\\Headers\\Win32 SDK";
     for (int i = 0; i < symIncludes.size(); ++i)
         symIncludes[i].prepend(QString("%1\\x86Build\\Symbian_Support").arg(m_carbidePath));
-    env.set("MWCSYM2INCLUDES", symIncludes.join(";"));
+    return symIncludes;
+}
+
+void WINSCWToolChain::addToEnvironment(ProjectExplorer::Environment &env)
+{
+    env.set("MWCSYM2INCLUDES", systemIncludes().join(";"));
     QStringList symLibraries = QStringList()
         << "\\Win32-x86 Support\\Libraries\\Win32 SDK"
         << "\\Runtime\\Runtime_x86\\Runtime_Win32\\Libs";

src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h

@@ -24,6 +24,7 @@ protected:
     bool equals(ToolChain *other) const;
 
 private:
+    QStringList systemIncludes() const;
     QString m_carbidePath;
     QString m_deviceId;
     QString m_deviceName;