# HG changeset patch
# User dadubrow
# Date 1242835034 18000
# Node ID ee2f99c3afcb4dcfee8107675b689a9a41d33119
# Parent  fd101e2ac6add867500fbabe3d113d3d11ea89c2
merge commmit

diff -r fd101e2ac6ad -r ee2f99c3afcb builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Wed May 20 10:55:43 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Wed May 20 10:57:14 2009 -0500
@@ -1347,7 +1347,7 @@
 								// add the absolute workspace path to the folder directly under the project.
 								// ideally we'd be more precise but then CDT creates a C folder named Foo\Bar,
 								// rather than just expanding Foo and then seeing bar a C source folder.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 
@@ -1358,7 +1358,7 @@
 								// add the absolute workspace path to the folder directly under the project.
 								// ideally we'd be more precise but then CDT creates a C folder named Foo\Bar,
 								// rather than just expanding Foo and then seeing bar a C source folder.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 
@@ -1366,7 +1366,7 @@
 							IPath fullPath = helper.convertMMPToWorkspace(EMMPPathContext.USERINCLUDE, path);
 							if (fullPath != null) {
 								// add the absolute workspace path to the folder directly under the project.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 						
@@ -1374,7 +1374,7 @@
 							IPath fullPath = helper.convertMMPToWorkspace(EMMPPathContext.SYSTEMINCLUDE, path);
 							if (fullPath != null) {
 								// add the absolute workspace path to the folder directly under the project.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}