copy default branch to C3_BUILDER_WORK branch so they are equal C3_BUILDER_WORK
authorcawthron
Fri, 28 May 2010 16:01:18 -0500
branchC3_BUILDER_WORK
changeset 1417 8e6d57a444fc
parent 1393 42f6165e68df
child 1418 8ca7cf978139
copy default branch to C3_BUILDER_WORK branch so they are equal
builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/SBSv2QueryTests.java
builder/com.nokia.carbide.cpp.builder.utils/plugin.properties
builder/com.nokia.carbide.cpp.builder.utils/plugin.xml
carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml
carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties
carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml
core/carbide_releases/configuration/server.properties
core/com.nokia.carbide.bugreport-feature/feature.xml
core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/images/about.png
core/com.nokia.carbide.cpp.doc.user/html/images/about_cpp.png
core/com.nokia.carbide.cpp.doc.user/html/images/background_carbide.jpg
core/com.nokia.carbide.cpp.doc.user/html/images/gold_header.png
core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java
core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java
core/com.nokia.carbide.cpp/html/images/s60_developers.jpg
core/com.nokia.carbide.cpp/icons/about.png
core/com.nokia.carbide.cpp/icons/about_cpp.png
core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/brandmark.png
core/com.nokia.carbide.cpp/splash.bmp
core/com.nokia.carbide.cpp/themes/carbide/graphics/root/brandmark.png
core/com.nokia.carbide.discovery.ui/icons/icon-discovery.png
core/com.nokia.carbide.search.system-feature/feature.xml
debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml
debuggercdi/com.nokia.carbide.trk.support/plugin.xml
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/IUSBConnectionType.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFUSBConnection.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFUSBConnectionType.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/USBConnectionType.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingService.java
debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java
qt/com.nokia.carbide.cpp.qt.ui/plugin.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/SBSv2QueryTests.java	Mon May 24 15:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/SBSv2QueryTests.java	Fri May 28 16:01:18 2010 -0500
@@ -17,40 +17,22 @@
 */
 package com.nokia.carbide.cdt.builder.test;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Properties;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
 import org.osgi.framework.Version;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.helpers.DefaultHandler;
 
 import com.nokia.carbide.cdt.builder.test.sandbox.ISBSv2ConfigData;
 import com.nokia.carbide.cdt.builder.test.sandbox.ISBSv2QueryData;
 import com.nokia.carbide.cdt.builder.test.sandbox.SBSv2QueryUtils;
-import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
-import com.nokia.cpp.internal.api.utils.core.Logging;
 
 public class SBSv2QueryTests extends BaseTest {
 	
+	private boolean printTimingStats = true;
+	
 	private static ISBSv2QueryData sbsAliasBaseQuery;
 	
 	private long startTime;
@@ -79,7 +61,9 @@
 		if (sbsAliasBaseQuery == null){
 			sbsAliasBaseQuery = SBSv2QueryUtils.queryAliasAndProductVariants();
 		}
-		System.out.println("Time for testQueryProductsFromSDKs(): " + getTimingStats());
+		
+		if (printTimingStats)
+			System.out.println("Time for testQueryProductsFromSDKs(): " + getTimingStats());
 		
 		HashMap<String, ISBSv2ConfigData> baseConfigs = sbsAliasBaseQuery.getBaseSBSConfigurations();
 		
@@ -181,7 +165,8 @@
 //		HashMap<String, String> outputMap = parseQueryConfigResults(queryResult);
 //		assertTrue("No configs were found in query for : " + SBSv2QueryUtils.QUERY_CONFIG_COMMAND, outputMap.size() > 0);
 //		
-//		System.out.println("Time for testQueryProductsFromSDKs(): " + getTimingStats());
+		if (printTimingStats)
+			System.out.println("Time for testQueryProductsFromSDKs(): " + getTimingStats());
 //		
 	}
 	
@@ -194,7 +179,7 @@
 		ISymbianSDK sdk = SDKCorePlugin.getSDKManager().getSDK(SDK_ID1, false);
 		assertNotNull("Missing SDK on your system: " + SDK_ID1, sdk);
 		List<String> products = sbsAliasBaseQuery.getProductsForSDK(sdk);
-		assertEquals(38, products.size());
+		assertEquals(19, products.size());
 	}
 	
 	public void testStressQueryTest() throws Exception {
@@ -227,7 +212,9 @@
 		testQueryProductsFromSDKs();
 		
 		startTime = stressTestStartTime;
-		System.out.println("Time for testStressQueryTest(): " + getTimingStats());
+		
+		if (printTimingStats)
+			System.out.println("Time for testStressQueryTest(): " + getTimingStats());
 	}
 	
 	
--- a/builder/com.nokia.carbide.cpp.builder.utils/plugin.properties	Mon May 24 15:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/plugin.properties	Fri May 28 16:01:18 2010 -0500
@@ -1,4 +1,5 @@
 // Copyright 2007 Nokia, Inc.
+BuilderUtils.Symbian_Build_Utils=Symbian Build
 
 BuilderUtils.Build_All_Targets=Build All Configurations
 BuilderUtils.Build_All_Targets_ToolTip=Build all configurations for the selected project
--- a/builder/com.nokia.carbide.cpp.builder.utils/plugin.xml	Mon May 24 15:37:56 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/plugin.xml	Fri May 28 16:01:18 2010 -0500
@@ -379,10 +379,21 @@
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
 			locationURI="popup:org.eclipse.ui.popup.any">
+			<separator name="SymbianBuildGroup" visible="true"/>
+		</menuContribution>
+		<menuContribution
+			locationURI="popup:org.eclipse.ui.popup.any?after=SymbianBuildGroup">
+			<menu
+				id="com.nokia.carbide.cpp.builder.utils.buildmenu"
+				label="%BuilderUtils.Symbian_Build_Utils">
+			</menu>
+		</menuContribution>
+		<menuContribution
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu">
 			<separator name="BuilderUtils" visible="true"/>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.preprocessSource"
 				label="%BuilderUtils.Preprocess">
@@ -392,7 +403,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.compileSource"
 				label="%BuilderUtils.Compile_Source">
@@ -402,7 +413,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.freezeSymbianComponent"
 				label="%BuilderUtils.Freeze_Symbian_Component">
@@ -412,7 +423,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.cleanSymbianComponent"
 				label="%BuilderUtils.Clean_Symbian_Component">
@@ -422,7 +433,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.buildSymbianComponent"
 				label="%BuilderUtils.Build_Symbian_Component">
@@ -443,7 +454,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.buildAllConfigs"
 				label="%BuilderUtils.Build_All_Targets"
@@ -465,7 +476,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.freezeExports"
 				label="%BuilderUtils.Freeze_Exports"
@@ -476,7 +487,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<command
 				commandId="com.nokia.carbide.cpp.builder.utils.commands.buildPKG"
 				label="%BuilderUtils.Build_PKG">
@@ -620,7 +631,7 @@
 			</command>
 		</menuContribution>
 		<menuContribution
-			locationURI="popup:org.eclipse.ui.popup.any?after=BuilderUtils">
+			locationURI="popup:com.nokia.carbide.cpp.builder.utils.buildmenu?after=BuilderUtils">
 			<menu
 				id="com.nokia.carbide.cpp.builder.utils.abldmenu"
 				label="ABLD">
--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Mon May 24 15:37:56 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/feature.xml	Fri May 28 16:01:18 2010 -0500
@@ -334,7 +334,6 @@
          
 <!--
 These source features will be moved to a new feature
-    <includes id="com.nokia.carbide.bugreport.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.capabilityScanner.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.codescanner.source" version="0.0.0"/>
  	<includes id="com.nokia.carbide.cpp.pi.source" version="0.0.0"/>
--- a/carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties	Mon May 24 15:37:56 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties	Fri May 28 16:01:18 2010 -0500
@@ -1,7 +1,6 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
                license.txt
-generate.feature@com.nokia.carbide.bugreport.source=com.nokia.carbide.bugreport
 generate.feature@com.nokia.carbide.search.system.source=com.nokia.carbide.search.system
 generate.feature@com.nokia.carbide.cpp.edc.source=com.nokia.carbide.cpp.edc
 generate.feature@com.nokia.carbide.cpp.core.source=com.nokia.carbide.cpp.core
--- a/carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml	Mon May 24 15:37:56 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml	Fri May 28 16:01:18 2010 -0500
@@ -326,8 +326,6 @@
     <!-- <includes id="com.nokia.sdt.uidesigner.source" version="0.0.0"/> -->
     <includes id="com.nokia.carbide.cpp.core.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.search.system.source" version="0.0.0"/>
-    <includes id="com.nokia.carbide.bugreport.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.edc.source" version="0.0.0"/>
 
-
 </feature>
--- a/core/carbide_releases/configuration/server.properties	Mon May 24 15:37:56 2010 -0500
+++ b/core/carbide_releases/configuration/server.properties	Fri May 28 16:01:18 2010 -0500
@@ -10,4 +10,4 @@
 com.nokia.carbide.cpp.news.reader.feed.listing.file=http://tools.ext.nokia.com/carbide_news_reader/feedListing.xml
 com.nokia.carbide.trk.support.service.TRKService=http://tools.ext.nokia.com/trk
 com.nokia.carbide.trk.support.service.TracingService=http://tools.ext.nokia.com/trk
-com.nokia.carbide.discovery.directory=http://tools.ext.nokia.com/carbide/updates/3.0/directory.xml
+com.nokia.carbide.discovery.directory=http://tools.ext.nokia.com/carbide/updates/3.0/discovery/directory.xml
--- a/core/com.nokia.carbide.bugreport-feature/feature.xml	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.bugreport-feature/feature.xml	Fri May 28 16:01:18 2010 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.bugreport"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.carbide.cpp"
       image="Carbide_Image.png">
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Fri May 28 16:01:18 2010 -0500
@@ -16,12 +16,16 @@
 <h2>Carbide.c++ bugs fixed </h2>
 <p>This is a comprehensive list of bugs fixed by release: </p>
 <ul>
-  <li>Bugs Fixed in <a href="#bugs260">2.6.0</a></li>
-  <li><a href="#bugs240">2.5.0</a>, <a href="#bugs240">2.4.0</a>, <a href="#bugs230">2.3.0</a>, <a href="#bugs220">2.2.0</a>, <a href="#bugs210">2.1.0</a>, <a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
-  <li><a href="#bugs131">1.3.1</a>, <a href="#bugs130">1.3.0</a> , <a href="#bugs122">1.2.2</a>, <a href="#bugs121">1.2.1</a></li>
+  <li>Bugs Fixed in <a href="#bugs300">3.0.0</a></li>
+  <li>Previous releases: <a href="#bugs260">2.6.0</a></li>
 </ul>
-<h3><a name="bugs260" id="bugs10"></a>Bugs Fixed in v2.6.0</h3>
-<ul><li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">10267</a> - Fixed an issue that prevented some executables from appearing in the Executables view. </li>
+<h3><a name="bugs300" id="bugs10"></a>Bugs Fixed in v3.0.0</h3>
+<ul>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">0</a> - <em>nada</em></li>
+</ul>
+<h4><a name="bugs260" id="bugs"></a>v2.6.0</h4>
+<ul>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">10267</a> - Fixed an issue that prevented some executables from appearing in the Executables view. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10525">10525</a> - Raptor builds correctly report an error of a missing header file and not the input source file itself. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10591">10591</a> - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10659">10659</a> - Updated x86 WINSCW tools to build 489. </li>
@@ -36,462 +40,7 @@
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10967">10967</a> - Resolved an issue where use of the hyphen character (-) in a file name was not recognized as a valid character. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11022">11022</a> - Carbide no longer relies on the <span class="code">SBS_HOME</span> environment variable being present to work with Raptor builds.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11072">11072</a> - Fixed an indentation issue that added additional tabs after typing &lt;enter&gt;. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11096">11096</a> - Resolved a crasher where the number of binaries being debugged exceeded the stop-mode limit allowed.</li>
-</ul>
-<h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10282">10282</a> -  Fixed an issue that prevented updating of the source path in the Executables view when working from a subst drive and a project is open that contains the source file.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10395">10395</a> - Fixed an issue in WINSCW where a const exception is thrown but it was not getting caught by a non const catch block.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10396">10396</a> - Added reminder &quot;NOTE Always run the Help &gt; Check for Updates wizard and install all updates before attempting to install new software. This can prevent the occurrence of any dependency errors.&quot; to the <a href="tasks/start/carbide_updating.htm">Upgrading Carbide.c++</a> page.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10467">10467</a> - Fixed a timeout problem with SBS version checks that caused Carbide to hang.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10477">10477</a> - Fixed an internal compiler error in floating point code generation during optimization.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10591">10591</a> - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10622">10622</a> -  Fixed a path issue where the MMP Editor would display platform path macros and unknown MMP statements.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10742">10742</a> - SBSv2 now always appears as a build option and  displays appropriate errors if the <span class="code">SBS_HOME</span> environment variable is missing.</li>
-</ul>
-<h3><a name="bugs240" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
-<ul>
-  
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9852">9852</a> - Fixed an issue that prevented the S60 GUI App template from building under SBSv2. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10308">10308</a> - The latest Qt plugins were converted to use P2 and now work in Carbide.</li>
-</ul>
-<h3><a name="bugs230" id="bugs6"></a>Bugs Fixed in v2.3.0</h3>
-<ul>
-  
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9818">9818</a> - Added support for Qt coding style to the Preferences &gt; C/C++ &gt; Code Style preference panel.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9800">9800</a> - Fixed an issue where the Project Explorer view that would sometimes display empty source and include directories within a project even though the Symbian Project Navigator view displayed them.</li>
-</ul>
-<h3><a name="bugs220" id="bugs7"></a>Bugs Fixed in v2.2.0</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5391">5391</a> - C++ source hover background color is now customizable. See Window &gt; Preferences &gt; C/C++ &gt; Editor.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9141">9141</a> - Fixed an issue when setting a breakpoint would force a refresh of the Executables view.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9332">9332</a> - Fixed bug where hitting debug would open the launch wizard when there was already an existing launch configuration for that project/build configuration. This would happen when the launch configuration was created from the launch configuration dialog rather than the launch wizard. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9583">9583</a> - Fixed bug where some &quot;extra&quot; variables were being displayed in functions with inline function calls. This could also cause corruption of &quot;real&quot; variable values.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9622">9622</a> - You can now pass arguments directly to SBSv2 builds using the Additional SBSv2 arguments field in the Build preferences panel.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9624">9624</a> - Fixed bug where changing the classname from the Qt project wizard would cause the project build to fail. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9625">9625</a> - Qt Gui project templates now set window as maximized.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9626">9626</a> - Qt GUI wizard templates now set window title to project name.</li>
-</ul>
-<h3><a name="bugs210" id="bugs4"></a>Bugs Fixed in v2.1.0</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9164">9164</a> - Added some diagnostic instrumentation to the Eclipse platform and Carbide to aid users in reporting resource and workspace refreshing issues. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9310">9310</a> - Can now properly save SBSv2 tools or gcc configurations in the Platform Filtering Preferences panel and added default Apply/Restore controls.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7351">7351</a> - Fixed an issue where cancelling &quot;Build all configurations&quot; should work and be much faster. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8500">8500</a> - Fixed an issue that when importing symbols where certain symbols contained erroneous address data. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8816">8816</a> - Bash errors should now appear in the Problems view. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8901">8901</a> - Fixed an issue in the error parser that prevented building Phone Debug builds due to Assembler warnings. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8914">8914</a> - Corrected an issue with scanning SDKs that cause the scan to repeat endlessly. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8934">8934</a> - Fixed some issues regarding missing or corrupt devices.xml files that preventing the setting of breakpoints. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8937">8937</a> - Fixed a bad assert in the MWCC compiler that was not checking for the existence of both a class and dtor. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8943">8943</a> - Fixed an issue in the error parser that caused code to be flagged as an error instead of a warning.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8964">8964</a> - Modified the behavior of the &quot;SDK Update Required&quot; check to prevent alerts while building or debugging when the OS version is unknown. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9006">9006</a> - Several on-device cheat sheets have been updated for connecting and debugging on remote devices. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9010">9010</a> - Fixed an issue that caused a NullPointerException when setting a breakpoint. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9021">9021</a> - Fixed a performance issue where the debugger searched for all source files every time a breakpoint was set. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9031">9031</a> - Fixed an indexing performance issue where too many unneeded source roots were indexed. Use the &quot;Window &gt; Preferences &gt; C/C++ &gt; Appearance &gt; Show source roots at top of project&quot; option to change how root sources are evaluated. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9033">9033</a> - Changed the Bld.inf import wizard behavior so that projects with three or fewer MMP files are automatically selected, while projects with more than three MMP files are left unselected by default. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9036">9036</a> - The new operator in the compiler now zero initializes new objects as defined in C++ Standard &sect;5.3.4.15. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9092">9092</a> - Fixed a NullPointerException in the News Reader involving the FeedCacheManager. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9135">9135</a> - Added additional documentation on source lookup paths. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9164">9164</a> - Added some diagnostic instrumentation to the Eclipse platform and Carbide to aid users in reporting resource and workspace refreshing issues. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9218">9218</a> - Added a new Carbide Extensions category for project property pages accessible to Carbide plugins.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9310">9310</a> - Can now properly save SBSv2 tools or gcc configurations in the Platform Filtering Preferences panel and added default Apply/Restore controls. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9320">9320</a> - Fixed a problem with handling character constants in macros when importing bld.inf files that prevented some SDKs from being recognized. </li>
-</ul>
-<h3><a name="bugs204" id="bugs5"></a>Bugs Fixed in v2.0.4</h3>
-<ul>
-  
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8050">8050</a> - Fixed an issue that preventing the building of a target when another target of the same project is being debugged.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8282</a> - Fixed several issues with <span class="code">PRJ_EXTENSION</span> that prevented resource building under SBSv1.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8694">8694</a> - Fixed an issue that prevented  building a project using SBSv2 when the workspace and kit resided on different drives.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8804</a> - Fixed a problem where the number of build errors reported wasn't consistent between the Console and Problem views.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8816</a> - Bash errors from SBSv2 should now appear in the Problems view. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8890</a> - The Mark All Read button in the Carbide News view now works as expected. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8914</a> - Corrected an issue with scanning SDKs that cause the scan to repeat endlessly. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8919</a> - Fixed a CORBA error with the Carbide symbol reading API that prevented its use.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8923</a> - Added explicit notes on checking the proxy setting in the Network Connections preference panel when experiencing issues with Hover Help. </li>
-</ul>
-<h3><a name="bugs203" id="bugs3"></a>Bugs Fixed in v2.0.3</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8196">8196</a> - Fixed an issue that caused executable files to be left open after using the Symbol Reader API.</li>
-</ul>
-<h3><a name="bugs202" id="bugs2"></a>Bugs Fixed in v2.0.2</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7473">7473</a> - Added PKG files to the Qt template projects so SIS files can be built and installed on a device. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7542">7542</a> - Updated Remote Connections UI to provide better descriptions when choosing between USB  or TRK 2.x USB (supports USB only). </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7915">7915</a> - Improved the timing out mechanism in Carbide so that TRK doesn't time out when target's are slow to respond.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8276">8276</a> - The main issue that caused Stepping line by line to be slow has been fixed. However, there are some cases where the slowness still appears. For example, when accessing files across a network, and the network is down or  if a source file is missing. Re-establishing the connection resolves the slow debugging issue.</li>
-</ul>
-<h3><a name="bugs200" id="bugs"></a>Bugs Fixed in v2.0.0</h3>
-<ul><li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=476">476</a> - Added the Move to Line command to set the PC location without resuming execution. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3800">3800</a> - Added &quot;New&quot; actions to the Symbian Project Navigator view so you can create new files, etc. from the context menu. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3850">3850</a> - Added the ability to create a new mmp file from the bld.inf editor. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3904">3904</a> - Selecting an MMP file in the Symbian Project Navigator view will now launch the correct executable. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3994">3994</a> - Build configurations are now linked correctly to a launch configuration to allow multiple launches using different builds. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4694">4694</a> - Holding a cursor over a variable name now highlights all instances of that variable name in the editor to allow easier identification of its use. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4718">4718</a> - Corrected an issue where the compiler was preventing the display of a local variable. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4936">4936</a> - Corrected an issue where [Templates] Class template instantiation to files outside the workspace could cause problems. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4937">4937</a> - Indexer should no longer fail when <span class="code">_LIT()</span> macros are used as function parameters.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5223">5223</a> - CodeScanner now provides a link from an individual error or warning to the rule which generated the error or warning.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5237">5237</a> - TODO items on the same line as a preprocessor statement now appear in the Tasks view. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5373">5373</a> - Fixed several issues where code formatting was behaving badly. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5376">5376</a> - The wait time to test if RVCT is available has been extended making it more likely that you can launch Dependency Explorer. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5448">5448</a> - Enhanced the loading of executables so that breakpoints in the server side of a client/server application are always found. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5461">5461</a> - Content assist now correctly uses namespace declarations.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5666">5666</a> - Pressing F3 on a class name inside a NONSHARABLE macro now works as expected.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5794">5794</a> - Indexer is now more robust when it finds &quot;using namespace...&quot; inside a header file. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5933">5933</a> - Fixed an issue where disconnecting from TRK would sometimes generate a panic condition. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6099">6099</a> - DLL symbols are now loaded correctly when attaching to a process using Application TRK for UIQ (v2.8.5).</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6288">6288</a> - The Project Updater should no longer crash with a NullPointerException error.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6415">6415</a> - Carbide now correctly handles the ERROR e87 message caused when a command line is too long to be handled by the tool </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6463">6463</a> - Fixed a null pointer exception error when launching the debugger. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6616">6616</a> - Successful project builds should no longer show &quot;build error&quot; messages based on CodeScanner errors.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6724">6724</a> - Changed the way renamed executables are tracked for on-device debugging to ensure the correct binary is targeted and its breakpoints hit.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6788">6788</a> - The descriptor length in the Variable view has been increased to 1024 Unicode characters.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6874">6874</a> - Carbide now supports the importing and creation of Qt projects for Symbian OS integration </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6900">6900</a> - Added support to the debugger for new descriptor classes LString8 and LString16. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6915">6915</a> - The Keys preference panel should no longer throw errors related to finding schemes </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6968">6968</a> - Added .aps extension to the list of default executable files recognized by the Executables view.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7108">7108</a> - Fixed a NullPointerException error that occurred when trying to open a declaration. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7124">7124</a> - Changed how Carbide.c++ locates SDKs to improve reliability.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7375">7375</a> - Opening a .RSS file in an editor view should no longer display syntax errors </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7493">7493</a> - Fixed an issue where adding a new class derived from a system base class did not work as intended. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7537">7537</a> - Set the Save Actions &quot;remove trailing whitespace&quot; to disabled by default as it was causing problems when diffing files. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7448">7448</a> - Fixed a configuration issue that prevented the Bug Reporter plug-in from submitting bugs. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7543">7543</a> - The launch configuration's File Transfer tab now marks missing host files with a warning icon and a message when it can't find the file to transfer. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7546">7546</a> - Fixed an issue that caused the Partial SIS upgrade to corrupt installations and prevent removal of the programs.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7577">7577</a> - Problems view sorting that depended upon Creation Time should now work properly.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7588">7588</a> - Builds using the &quot;Build Symbian Component&quot; now correctly display a progress dialog.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7596">7596</a> - The Location field in the Problems view should now sort correctly.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7599">7599</a> - Fixed a problem where all potentially built elements are still added to a launch configuration, but only those actually being built at the time of launch config creation are enabled.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7641">7641</a> - Fixed a bug where pressing &quot;Delete&quot; on Problems view when the bld.inf or mmp text editor was open caused the delete action to be directed to the editor rather than the view.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7748">7748</a> - Dependency files are no longer generated in working directory when doing &quot;abld listing&quot; </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7782">7782</a> - Converted shortcuts to use the new command style which should make key bindings more reliable.</li>
-</ul>
-<p><b>RC1</b></p>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7375">7375</a> - Opening a .RSS file in an editor view should no longer display syntax errors.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7376">7376</a> - A class cast exception now logs an error containing the element it's expecting to be a class but isn't instead of a internal error.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7486">7486</a> - Use of duplicate key bindings for Import and Export has been corrected by using Eclipse 3.4.1.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7493">7493</a> - Fixed an issue where adding a new class derived from a system base class did not work as intended.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7532">7532</a> - Mapped the Synergy file _ccmwaid.inf to open in the text editor instead of the MMP/INF editor which generated incorrect error warnings and prevented builds. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7542">7542</a> - Updated Remote Connections UI to provide better descriptions when choosing between USB (supporting both TRK and Tracing) or TRK 2.x USB (supports USB only).</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7611">7611</a> - Fixed a UI refresh issue on Tube devices that prevented Connect/Disconnect from working.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7621">7621</a> - Updated examples and code generator to properly remove icon references</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7637">7637</a> - Clarified the message when you choose to update old projects and then don't select a project to update.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7776">7776</a> - The 'NULL' keyword and other macro references are now highlighted as they were in Carbide 1.3.x.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7814">7814</a> - Updated the Basic DLL template to work with EKA2 projects. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7866">7866</a> - An issue that prevented installing TRK on N96 CE Devices has been resolved.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7921">7921</a> - Updated the OpenC Hello World template to work with EKA2 projects. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7926">7926</a> - The cursor should  no longer jump between insertion points when a source or header path is selected in the New Symbian OS Class wizard.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7927">7927</a> - Browsing code in the Call Hierarchy window using F3 should no longer throw a NullPointerException error.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7943">7943</a> - Adding executables with non-standard suffixes should now work as expected.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7953">7953</a> - Fixed an issue where selecting several components from project explorer and using Build All Configurations caused errors.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7978">7978</a> - Fixed a problem where some build problems were not detected when launching.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=8010">8010</a> - Renamed some template names to clarify their type and intended use.</li>
-</ul>
-<h3><a name="bugs131" id="bugs131"></a>Bugs Fixed in v1.3.1</h3>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3261">3261</a> - You can now run the following individual abld commands from a new ABLD submenu under the Project and context menus: export, cleanexport, resource, target, final and tidy.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4102">4102</a> - Fixed a problem where Ctrl-~ sometimes opened the wrong header file</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4106">4106</a> - You can now import a bld.inf that does not reference any MMP or MAK files</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4166">4166</a> - Fixed a problem that sometimes left the main EXE locked after loading when debugging multiple targets </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5223">5223</a> - CodeScanner now provides a link from an individual error or warning to the rule which generated the error or warning</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5254">5254</a> - The C/C++ &gt; Editor option &quot;Ensure newline at end of file when saving&quot; is now enabled by default</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5522">5522</a> - The New Launch Configuration Wizard has been updated to choose an EXE as the main executable instead of a DLL when at least one is present in the project</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5648">5648</a> - Corrected an issue where breakpoints were not getting hit when a DLL was build
-  during a debug launch</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5815">5815</a> - The debugger now shows a full call stack when it stops at a memory watch point</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5933">5933</a> - Fixed an issue where disconnecting from TRK would sometimes generate a panic condition.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6007">6007</a> - Made several enhancements to the build system including: adding an ABLD menu option, not refreshing the project when a build is completed when auto-refresh is enabled, and moved the ROM builder panel into the Project Settings page to address a progress bar issue.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6040">6040</a> - The MMP Selection page in the &quot;Import &gt; Symbian OS Bld.inf file&quot; wizard has been redesigned to include sortable columns for build order, file names, and location, to make locating MMP files easier</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6222">6222</a> - Fixed an issue that could cause Carbide to crash and corrupt the workspace.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6229">6229</a> - Fixed a couple of issues where the Executables view and Executables tab behaviors and UI were not syncing correctly causing errors when trying to debug DLLs.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6262">6262</a> - Fixed an issue where the emulator failed on startup with a Null exception error</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6288">6288</a> - The Project Updater should no longer crash with a NullPointerException error</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6299">6299</a> - Suspending the debugger and trying to resume it should no longer cause the application being debugged to hang</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6371">6371</a> - Carbide no longer throws a Null pointer exception when attempts are made to add paths to a project outside of the MMP/INF files</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6377">6377</a> - Reworded help on setting conditional breakpoints to clarify their temporary nature.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6378">6378</a> - Revised steps on setting conditional breakpoints to clarify process.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6381">6381</a> - Revised help on opening the Breakpoints view</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6383">6383</a> - Revised help to clarify the enabling and disabling of breakpoints</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6384">6384</a> - Revised help on removing breakpoints information</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6385">6385</a> - Revised steps on setting up watchpoints from different views</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6415">6415</a> - Carbide now correctly handles the ERROR e87 message caused when a command line is too long to be handled by the tool</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6417">6417</a> - Carbide now correctly shows in the Problems view error messages with multiple defined symbols</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6450">6450</a> - STL classes are now recognized by the variable formatter</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6459">6459</a> - The Emulator field in a new emulator launch configuration should now be filled in correctly when pressing F11 or clicking Run &gt; Debug</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6462">6462</a> - Corrected an issue where workspace layouts were lost when a null pointer exception was thrown.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6497">6497</a> - Run to Line and Continue from line should now behave correctly when used in source files whose locations have been remapped</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6511">6511</a> - Additional variable formats like STD have been added to improve how they are displayed in the Variables view</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6525">6525</a> - Using the &quot;Resume at line&quot; command should no longer require a Carbide restart</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6574">6574</a> - Moved the separate ROM builder into the Carbide builder (Properties &gt; Carbide Build Configurations) and revised the project updater to remove the ROM builder and convert any existing preferences (command line and working directory) to non-WINSCW build configurations</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6590">6590</a> - Added Language ID 186 to the MMP handling routines that was causing a NullPointerException error</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6615">6615</a> - Added a new extension point (com.nokia.carbide.cdt.builder.environmentModifier) to our builder plugin that allows you to register an environment modifier for modifying project paths</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6635">6635</a> - Multiple fixes to improve the setting of breakpoints from a call stack</li>
-</ul>
-<h3><a name="bugs130"></a>Bugs Fixed in v1.3.0</h3>
-<p><b>IDE</b></p>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=188">188</a> - Selecting a .h file name in a editor and pressing F3 (Open Declaration) opens a new editor view and displays the .h file</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=853">853</a> - Added text color support in the Build Console to make reading logs easier on the eye</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=2887">2887</a> - The behavior of project level commands was improved to better follow Eclipse guidelines as well as be more context sensitive. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3248">3248</a> - The Symbian Project Navigator view can now toggle between showing the normal Bld.Inf structure or showing folders using the SOURCEPATHs in the MMP file</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3266">3266</a> - Macros now appear in the index and can be found using normal search methods</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3271">3271</a> - System Search now supports the searching of any directory visible to the OS</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3350">3350</a> - The SIS Builder page in the Carbide Build Configurations property window now supports the generation or one or more output files using different key pairs based upon the same sources.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3407">3407</a> - File search should now find items even if the indexer is still running</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3425">3425</a> - The console view now shows a message to let you know it has finished compiling your sources</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3432">3432</a> - Carbide now does a better job of detecting changes to MMPs with includes and should now rebuild correctly</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3448">3448</a> - Use of non-standard font sizes in labels and views are supported better </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3457">3457</a> - Updated indexer to support virtual functions better so that jumps to function  declarations from a function pointer should now work as expected </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3471">3471</a> - System Search supports text searching of the &quot;\epoc\include&quot; directory</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3544">3544</a> - You can now set the default build action behavior of the workspace or a project when modified MMPs are detected</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3566">3566</a> - It is now possible to not sign, self sign, or sign with certificate/key pair SISX files in the project's SIS Properties dialog. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3671">3679</a> - The Build icon displayed in the toolbar now has a tooltip</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3696">3696</a> - The bld.inf editor now correctly handles <span class="code">#if/#endif</span> situations when exports are added to the <span class="code">bld.inf</span> file</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3720">3720</a> - Formatting of pasted code now works correctly </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3731">3731</a> - It is now possible to save files not part of a source path have been addressed     </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3743">3743</a> - MS Visual Studio shortcuts added: Ctrl+F2 (Add Bookmark), Ctrl+G (Go to Line)</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3741">3741</a> - Content Assist now includes enums in classes </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3792">3792</a> - SDK versions for UIQ SDKs are correctly identified more which allows them to be used</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3879">3879</a> - Carbide now monitors the variant header file and forces a rebuild on the effected source files</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3914">3914</a> - Eclipse TODO tasks feature now supported</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3925">3925</a> - The &quot;debug MMP&quot; option is no longer offered when creating a project. Instead, you are asked to directly select the MMP to use as the default for launching the project</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3940">3940</a> - C/C++ Indexer should no longer hang when it encounters a C++ style comment on the same line as a single line macro definition</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4031">4031</a> - The Carbide compiler now recognizes the WINSCW deprecation flag in S60 applications</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4085">4085</a> - Building a project with only test MMPs no longer does an &quot;abld build&quot;</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4112">4112</a> - You can now use the Template Wizard: Copy File process to copy files stored in  JAR files </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4131">4131</a> - Pressing the external editor for the text property will now correctly activate the scalable string editor</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4132">4132</a> - You can now select &quot;Use default incremental builder&quot; to launch a program without calling make when nothing in the workspace has changed</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4143">4143</a> - Support for the <span class="code">DEBUGGABLE</span> option is now available in the MMP Editor and included in the project templates. This allows an application to be debugged using the Carbide on-device debugger when targeting Symbian OS v9.4 or later versions. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4145">4145</a> - Canceling a build should now work more reliably</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4147">4147</a> - Copying text from a source editor and pasting it into an external editor like MS Word, will no longer copy and paste the background color as well</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4188">4188</a> - Freeze exports now takes the list of mmp's being built into consideration</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4388">4388</a> - Code Assist now ignores &quot;private:&quot; when invoked within a class</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4402">4402</a> - Copious repeats of missing MAP/DLL error messages have been eliminated</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4410">4410</a> - Freezing exports no longer passes the &quot;-r&quot; flag to abld with EKA1 kits</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4442">4442</a> - Added missing plugins so that Carbide editors now support use of Shift-JIS</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4470">4470</a> - A StringIndexOutOfBoundsException error is no longer thrown when a binary has no file extension during an indexing operation</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4512">4512</a> - Using &quot;Open File&quot; on a BAT or CMD file now correctly opens the file in an editor instead of executing it</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4541">4541</a> - Linker errors are now properly shown in the console view when using GCC-E.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4553">4553</a> - Re-opening a workspace should no longer issue an error stating &quot;No configuration can be found&quot; when a project in the workspace contains no launch configurations</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4579">4579</a> - Added the Symbian resource file compiler 'mwwinrc.exe to the Carbide installation</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4590">4590</a> - Changing MMP includes now refreshes the EXE </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4592">4592</a> - Auto-complete now correctly returns all info for templated classes</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4612">4612</a> - SPN now displays the correct relative path when multiple projects exist</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4657">4657</a> - Fixed performance problem when trying to determine RVCT install location when disconnected from the network</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4660">4660</a> - Added CodeWarrior key mappings for "Go to line" (CTRL+G) and "Undo"  (CTRL+Backspace) commands </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4661">4661</a> - Editing the SymbianMacroStore.xml file within the sdk.core plugin allows you to add new new SDK release versions without waiting for a patch. A more elegant solution will be investigated for a subsequent release.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4672">4672</a> - The Search view should now present a more consistent display and not flip between different pages each time its opened</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4702">4702</a> - Changes to included MMP files are now reflected in the SPN view immediately</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4795">4795</a> - When deleting projects from the workspace, the accompanying .pdom files are also deleted</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4838">4838</a> - MAKEDEF freeze warnings are now displayed by the Problems view </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4949">4949</a> - Debugger now displays the correct variable values  in compiled RVCT programs </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5027">5027</a> - Fixed an issue where setting a breakpoint in "Thumb" mode would crash the code  instead of stopping at the breakpoint </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5032">5032</a> - Dragging a file from the SPN view to a P4 Pending Changelist view correctly adds the file/project to the changelist</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5067">5067</a> - Use of the CTRL+B key binding has been made more consistent when changes are  made to code </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5169">5169</a> - You are now prompted which MMP file to use when compiling a file that is used  in multiple MMP files. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5170">5170</a> - The SPN view now displays files referenced from Bld.inf using #include in an  "Includes" folder group under Bld.inf. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5178">5178</a> - Accessing invalid memory locations when using SysTRK should no longer crash the  device </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5179">5179</a> - Key bindings for Build/Clean Symbian component now work for MMP files</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5187">5187</a> - Code generation of navigation tab-switching in S60 Multi-view applications has been improved</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5194">5194</a> - Fixed bug where build would never finish if there were linker errors and the machine had Cygwin installed</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5199">5199</a> - The default path to find the Codescanner executable is now set correctly</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5218">5218</a> - Pointers are now auto dereferenced one level as they are in CW and VS for the  Expressions and Variables views. For example "this" now points directly to the  underlying class. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5229">5229</a> - A new S60 version of the Symbian OS style has been added that enables &quot;Insert spaces for tabs&quot; by default</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5242">5242</a> - The shortcut for opening the System Search page in the Search window has been set to Alt+Shift+G </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5244">5244</a> - Parsing was made more robust to deal with some language variants not previously covered      * 5246 - Using a key binding should no longer cause an internal error when attempting to compile a file</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5246">5246</a> - Using a key binding should no longer cause an internal error when attempting to  compile a file </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5278">5278</a> - Fixed some build dependency issues that prevented makefiles from being updated properly</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5299">5299</a> - Several missing command groups like "Open Type" which were in C/C++ Perspective  have been added to the Carbide C/C++ perspective by default. You can still  customize the command groups that appear using the Customize Perspective  dialog. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5345">5345</a> - Added support for MMP keywords STDDLL and STDEXE when using Open Environment</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5366">5366</a> - Dependencies are now updated properly when files are deleted/renamed in the workspace</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5368">5368</a> - Fixed an issue where CONFIG_DLL_PREFIX is blank and parsing a DLL target stopped</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5372">5372</a> - Drag and drop now supports these file types: ini, symbol, iby, oby, log, src</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5376">5376</a> - The wait time to test if RVCT is available has been extended making it more  likely that you can launch Dependency Explorer </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5379">5379</a> - Dragging distribution.policy files from the desktop onto the editor window now  opens it in Carbide</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5381">5381</a> - Added an additional check for problem markers at the end of the build process  to ensure that any build failure outputs a build failed message to the Console  and does not generate a SIS file </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5382">5382</a> - Fixed an issue where an IOException was thrown in calls to the Type Hierarchy</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5389">5389</a> - Debugger "Internal error occurred during: child count update" error is now  handled correctly </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5423">5423</a> - The lookup of #include files now doesn't re-read the same bld.inf every time which caused a slowdown of file importing</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5430">5430</a> - Removed the erroneous warning message when the path to a certificate/key files  contains spaces </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5449">5449</a> - Variables view now correctly dereferences "this" by one level to show its  content </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5463">5463</a> - The Standard Out text color is now used in the Debug console view </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5464">5464</a> - The CDT Build Console background color can now be changed. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5474">5474</a> - RVCT and GCCE now correctly generates dependency files for assembler sources (.s)</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5481">5481</a> - Fixed an issue where Error Messages and Warning were shown with a "Connecting Names" prefix that prevented links to the source file from working
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5486">5486</a> - Added an API to enable and disable the x86 build option. See the Carbide  Plug-in Developer Guide for details. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5487">5487</a> - You can now add a Memory Monitor view to any variable shown in the Variables  view </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5504">5504</a> - Added support in the build chain to detect changes to USERINCLUDE in the MMP  file not supported by the Symbian command line build </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5505">5505</a> - Changed default behavior to not show "Path Entry Problem" as the messages did  not contribute useful info related to MMP files or the build </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5509">5509</a> - Updated indexer to show all classed when creating a new class </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5527">5527</a> - Carbide now generates a more obvious warning when the project root is reverted to the bld.inf directory or the user edits the path so that some source directories excluded </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5536">5536</a> - Updated Carbide so that the new Project Explorer view takes precedence over the  C/C++ Projects view </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5565">5565</a> - Fixed issues with the Symbian OS DLL wizard not setting the correct UID2 value  and uploading to \system\libs instead of \sys\bin </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5566">5566</a> - Resolved issues where the S60 application wizard was using an unnecessary  static_cast and creating an unneeded file server session </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5605">5605</a> - Expanded explanation of "Do not step into runtime support code" to better   explain what the user should experience when they enable of disable this option </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5618">5618</a> - Added a check in the error parser that prevented some symbol error messages  from being recognized and shown in the Console </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5624">5624</a> - Fixed dependency problem with older 9.1 SDK's (S60_3rd_MR) for GCCE builds.  A  reallyclean must be done to pick up the fix. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5625">5625</a> - Fixed a deadlock issue that prevented the termination of a debug session when  using the context menu </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5632">5632</a> - Macro scanner updated to account for #undef's in RnD platforms *.hrh files </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5644">5644</a> - Added GNU C++ cSource and cHeader mappings to use the C++ language indexer.  This works for new projects, but users with existing workspaces should go to  Window &gt; Preferences &gt; C/C++ &gt; Language Mappings and add these two entries: C  Source File ==&gt; GNU C++, and C Header File ==&gt; GNU C++. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5654">5654</a> - Fixed bug where source directories from newly added mmp files to a project were  not being treated as real source directories. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5663">5663</a> - .PKG file with Asian characters are now re-encoded correctly </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5669">5669</a> - The Edit Include Paths dialog for the MMP File Editor is now usable as it now  supports the use of normal, large, and extra large font settings </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5734">5734</a> - Fixed a font resizing issue in the Project properties &gt; Carbide Build  Configurations &gt; Arguments pane that prevented the dialog from sizing properly  to show all the options </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5735">5735</a> - Fixed a bug in the call to makesis when a content search location was  specified. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5736">5736</a> - Revised layout in Add/Remove Carbide Build Configurations dialog to resize  correctly on Vista, regardless of font size. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5743">5743</a> - Additional key bindings added to support more commands in Carbide </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5747">5747</a> - Revised tooltip in MMP Editor &gt; Options tab to read "bytes" instead of  "kilobytes" </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5820">5820</a> - Source folders in the Project Explorer view are now sorted alphabetically </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5827">5827</a> - Fixed an issue where a debug session would fail to launch on the WINSCW  emulator </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5870">5870</a> - Client applications should now close properly when a PANIC occurs when using  ODD. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5943">5943</a> - Fixed a crasher in the Capability Scanner occurring in some CustKits. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6032">6032</a> - Fixed an issue where Ecom plugin resources were not being included in the File Transfer tab in debugger launch configurations</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6173">6173</a> - The Search/Replace command now finishes properly even if it reports stale  matches without locking up the application </li>
-</ul>
-<p><b>Debugger</b></p>
-<ul>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=2137">2137</a> - Rendering of an unsigned short is now correct in Variables view</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=2285">2285</a> - You can now toggle breakpoints in both the C++ and Debug perspectives</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=3788">3788</a> - Carbide 1.3 uses new targeting rules to target executables. By default all executables for the SDK are targeted for debugging even if they are from other projects in the workspace</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4015">4015</a> - The new global option &quot;Find source files outside the SDK&quot; in the Carbide.c++ Debugger preference panel controls how the debugger automatically searches for source files both inside and outside of the SDK epocroot</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4029">4029</a> - TRK now supports the reporting of RDEBUG messages to the Log view &gt; Unframed Messages when the &quot;View unframed messages from communications port&quot; option is enabled. Note that due to timing issues a flood of <span class="code">RDebug::Printfs</span> from the application to TRK can result in some messages being missed. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4418">4418</a> - It is now possible to set memory watchpoints</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4545">4545</a> - Corrected a use case where DE failed to unlock a file which prevented a project rebuild</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4623">4623</a> - Console logs are now cleared before a new debug session begins to prevent the log file from growing too large</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=4628">4628</a> - When launching a debug session using the emulator usually the emulator (epoc.exe) is launched and you must then navigate to your application and open it. However launching a debug session for an .exe file will, in most cases, launch the .exe directly. This will start the emulator and then open your application automatically. However some SDKs do not support this behavior and in those cases you will have to continue to open your application in the emulator manually.</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5025">5025</a> - Fixed a debugger termination issue that deadlocked some processes and threw an  "Exception processing debug async queue" error </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5053">5053</a> - Breakpoints are now properly hit in nested static DLLS when debugging on-device</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5190">5190</a> - Fixed an issue in the Executables view that caused an error when displaying the context menu</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5225">5225</a> - Toggling a breakpoint inside a method and not on the method name itself, should  work as intended and not show an error </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5380">5380</a> - Mapping binaries to different source directories using the Executables view has been enhanced to also include the SDK directory</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5394">5394</a> - Imported binaries are now resolved better the location of source files</li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5395">5395</a> - Added clarification information to the Symbian OS Application panel to help users better choose the correct launch configuration </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5621">5621</a> - Fixed an issue where the ODD installation of SISX file gives an error message  but the application is still installed </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5623">5623</a> - KERN-EXEC-3 panics should no longer cause rebooting of ARM11 devices during on  device debugging </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5645">5645</a> - Key mapping for Debug corrected to operate the same in different views </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5730">5730</a> - Extended the timeout for ODD installations to 5 minutes to compensate for large  (4+MB) SIS file installations </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5790">5790</a> - Fixed a debug state synchronization problem between TRK and the host debugger  that prevented the target application from launching </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5831">5831</a> - Validation of the emulator path is now done before attempting to launch a debug  session. An invalid path will fail gracefully without starting the debug  session. </li>
-  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=6036">6036</a> - Debug Trace Messages console no longer stops working after first debug session </li>
-</ul>
-<h3><a name="bugs122" id="bugs122"></a>Bugs Fixed in v1.2.2</h3>
-<p><b>IDE</b></p>
-<ul><li>2421 - Changing the SDK ID no longer creates a second entry in the <span class="code">devices.xml</span> file</li>
-  <li>2562 - The UIQ version of TRK now correctly updates information in the UI</li>
-  <li>3855 - Breakpoints are no longer reached once they are removed.</li>
-  <li>4032 - Errors are now correctly removed from the Errors view when the source line containing the error is deleted</li>
-  <li>4056 - A new option for Freeze Symbian Component has been added that freezes only the selected MMP file and not the entire project</li>
-  <li>4075 - The internal error "Computing hasChildren" should no longer occur due to a float reference type being incorrectly treated as a pointer type</li>
-  <li>4106 - You can now import a bld.inf that does not reference any MMP or MAK files</li>
-  <li>4115 - Fixed problem where certain resource errors like "label not found" were treated as warnings in the problems view</li>
-  <li>4118 - The CDT macros <span class="code">__EXE__</span> and <span class="code">__DLL__</span> are now correctly added to the command line when there is only one MMP file in the bld.inf for a given build config, or if there are multiple MMP files but they all have the same target type macro. Otherwise, nothing is added</li>
-  <li>4119 - Fixed an issue where Carbide would close when an array out of bounds error occurred</li>
-  <li>4140 - Corrected a deadlock issue that could cause Carbide to hang on startup</li>
-  <li>4147 - Copying text from a source editor and pasting it into an external editor like Word, will no longer copy and paste the background color as well</li>
-  <li>4165 - Using &quot;Open File&quot; on a BAT file now correctly opens the file in an editor instead of executing it</li>
-  <li>4168 - The default project root directory is now correctly calculated for <span class="code">prj_exports</span> and <span class="code">prj_testexport</span> source paths, just like the bld.inf, mmp, make, source and include paths</li>
-  <li>4196 - Fixed an issue that caused a <span class="code">NullPointerException</span> when creating emulator launch configuration that did not contain a <span class="code">TARGET</span> in the MMP file</li>
-  <li>4197 - Fixed an issue that could cause the PI Function tab to hang when zooming to the entire selection</li>
-  <li>4198 - Source files in imported executables can now be mapped to new locations</li>
-  <li>4200 - Carbide now respects the <span class="code">clean</span> and<span class="code">reallyclean</span> settings when &quot;Clean Project&quot; is chosen</li>
-</ul>
-<p><b>Debugger</b></p>
-<ul>
-  <li>3855 - Breakpoints are no longer reached once they are removed</li>
-  <li>4075 - The internal error &quot;Computing hasChildren&quot; should no longer occur due to a float reference type being incorrectly treated as a pointer type</li>
-  <li>4198 - Source files in imported executables can now be mapped to new locations</li>
-</ul>
-<h3><a name="bugs121"></a>Bugs Fixed in v1.2.1</h3>
-<p><b>IDE</b></p>
-<ul>
-  <li>326 - The Goto macro declaration now works</li>
-  <li>1450 - Notification of missing Perl scripts/tools directory has been improved</li>
-  <li>1470 - ARMV5 programs shold now display all  local variables </li>
-  <li>2793 - Forum Nokia site (<a href="http://www.forum.nokia.com/">www.forum.nokia.com</a>) updated to include v1.2 license information </li>
-  <li>3314 - Syntax highlighting and 'Find declaration/definition' now works for sources not included in MMPs </li>
-  <li>3442 - Build All Configurations now also builds the test code too. You can disable this in the Carbide.c++ preferences. </li>
-  <li>3446	- Error message improved when SDK Prefix File is not found in SDK properties </li>
-  <li>3530 - The BWIN folder now appears automatically after freezing a project </li>
-  <li>3555	- The build  key bindings should now work </li>
-  <li>3588	- INF Editor now supports  UNIX-style paths in the Export page </li>
-  <li>3637	- The targetpath in an .mmp file should now appear in the MMP Editor &gt; TargetPath text box </li>
-  <li>3658 - The &quot;System resource list&quot; and &quot;Resource list&quot; no longer share the same icon in the MMP Editor</li>
-  <li>3660 - The Symbian Project Navigator view now includes an AIF folder for images</li>
-  <li>3675	- The Add SDK dialog now validates for spaces in the EPOC root path </li>
-  <li>3700	- Changing the order of a macro paths in the MMP Editor no longer prints it  multiple times </li>
-  <li>3702	- SDKs are now identified in the SDK Preference panel by  the name used in the prefix file and not the SDK common name </li>
-  <li>3703 - The INF Importer now issues a warning instead of an error when a project references the drives root directory or another drive</li>
-  <li>3705	- The INF Importer now issues an error when it encounters space characters in the path to the bld.inf file </li>
-  <li>3707	- An alert now appears in the INF Importer when no MMP file is selected</li>
-  <li>3714	- The correct path for BMP files is now displayed in the Symbian Project Navigator view and the MIF Editor</li>
-  <li>3716 - Improved Freeze Exports command to always add -r when freezing and to only appear as an option on the project context menu</li>
-  <li>3717	- The Symbian Project Navigator view now correctly caches and displays .mk files that may have prevented compilation </li>
-  <li>3723	- The INF Importer wizard no longer shows duplicate MMP selections </li>
-  <li>3724	- Test MMPs now correctly appear in the  Symbian Project Navigator view  (see 3442, 4019) </li>
-  <li>3725	- The IDE now correctly identifies   bld.inf/mmp files as dirty when changes are made to the same line after a save </li>
-  <li>3726	- Test MMP components now correctly appear in the  Symbian Project Navigator view (see 3724, 4019) </li>
-  <li>3747 - Set the default behavior of Folding Header comments to disabled </li>
-  <li>3749 - RSC file extensions are now  correctly picked up by the File Transfer page in a SysTRK launch configuration </li>
-  <li>3754	- INF Editor now  remembers the settings for Tidy, Manual, and Support columns </li>
-  <li>3756	- DEF files are now correctly found and shown in the  Symbian Project Navigator view after Freeze Export </li>
-  <li>3763	- Creating a new project no longer generates a UID 2 error when the MMP file appears </li>
-  <li>3765	- Deleting UID 2 no longer causes UID 3 to use the UID 2 value in the MMP Editor </li>
-  <li>3768	- Carbide now issues a &quot;Bld.inf file cannot be at the root of the workspace&quot; error when it finds the bld.inf at the root </li>
-  <li>3774 - Added key shortcuts for &quot;Build/Clean Symbian Component&quot; commands </li>
-  <li>3779	- Carbide now issues an alert of Perl is not found at startup and error messages to the Console if Perl v5.6.1 is not available (required by some Symbian build components) </li>
-  <li>3802	- bld.inf files are now updated correctly when PRJ_Exports are moved</li>
-  <li>3810	- Moving files no longer invokes a permission dialog when the Always Change option is activated</li>
-  <li>3867	- Vendor specific macros for S60 3rd Ed. are now recognized </li>
-  <li>3868 - Macros defined in variant.cfg are not added as prefix include macros </li>
-  <li>3887- The INF Importer wizard no longer shows duplicate MMP selections (see 3723) </li>
-  <li>3900 - Long error messagesd in the SDK Preferences panel should no longer be truncated </li>
-  <li>3923 - The Compile key shortcut (Ctrl+Alt+C)  now works properly </li>
-  <li>3924	- Build WINSCW targets should no longer show system stack traces anymore </li>
-  <li>3927	- Code formatting to align first level braces is now working</li>
-  <li>3928	- Alerts incorrectly stating that spaces are not allowed for  paths sent to signsis has been corrected </li>
-  <li>3929 - Changing EPOCROOT in the  SDK Property dialog now correctly updates the prefix file </li>
-  <li>3930	- Can now build for two different SDKs on different drives using the same location of the bld.inf file </li>
-  <li>3940	- The C/C++ Indexer should not hang when indexing a CPP file any more </li>
-  <li>3943	- Updated commands to reflect command change from  &quot;Build All Targets&quot; to &quot;Build All Configurations&quot;  (see 4021) </li>
-  <li>3945	- Added option setting to activate/deactivate Verbose (-v) during a full, targeted , or Symbian build, as well as clean operations </li>
-  <li>3960	-  Open in Command Window now correctly opens directories on  drives other than C:\ </li>
-  <li>3961	- Importing a project no longer generates incorrect &quot;duplicate path entries&quot; warning message</li>
-  <li>3965	- Customers with valid licenses should no longer see license warning messages unless their license file is corrupted</li>
-  <li>3967	- Choosing &quot;Open Command Window&quot; should now open the directory correctly, not one level up</li>
-  <li>3974 - The Symbian Project Navigator view now correctly detects when a missing MMP file is added and no longer shows the &quot;missing&quot; icon </li>
-  <li>4004	- Updated Breakpoint documentation to clarify that the symbols for a module must be loaded before any breakpoints in that module can be resolved (see 3916) </li>
-  <li>4017	 - Updated Debug view's Disconnect control  documentation on its ability to detach from an attached process/thread with TRK</li>
-  <li>4019	- Added &quot;Build test components...&quot; option to  Carbide.c++ preference panel documentation (see 3442) </li>
-  <li>4021	- Updated documentation to change &quot;Build All Targets&quot; to &quot;Build All Configurations&quot; (see 3943) </li>
-  <li>4022	- Added &quot;Verbose output...&quot; option to  Carbide.c++ preference panel documentation (see 3945)</li>
-  <li>4035 - Bld.inf/mmp parser no longer misinterprets &quot;<span class="code">../</span>&quot; in macros</li>
-  <li>4047	- Corrected key shortcuts for Previous/Next Word MSVC shortcuts </li>
-</ul>
-<p><b>Debugger</b></p>
-<ul>
-  <li>415 - The Modules view    now correctly shows symbols for loaded executables and DLLs</li>
-  <li>591 - The Expressions view now correctly refreshes    with derived type variables</li>
-  <li>2129	- The Variables view now correctly shows unsigned char variable values using Natural Format </li>
-  <li>2204 - While stepping over some global variables that are getting initialized the PC counter skips over the line </li>
-  <li>2207	- The option Run &gt; Restart is now correctly disabled for Stop Mode debugging </li>
-  <li>2236	- Floating point values are no longer treated as decimals</li>
-  <li>2238	- Double values  are no longer treated as decimals</li>
-  <li>2530	- The Details pane now always shows the string value instead of the address value of the char pointer </li>
-  <li>2967	- The Symbian OS Data view now correctly retains its size when maximized and another tab is pressed in the view </li>
-  <li>2998	- The Debug view correctly resets its state when terminating a debug session so that the controls are not disabled </li>
-  <li>3245	- You can now  Detach from an attached process or thread</li>
-  <li>3262	- In the Memory View, changing memory content to Traditional View rendering now correctly updates the view </li>
-  <li>3751	- The ROM Log file TRK launch configuration is now documented </li>
-  <li>3819	- A TRK debug session that fails will no longer leave a process running in the Debug view </li>
-  <li>3836	- The Memory view now handles &quot;array out of bounds&quot; exceptions better </li>
-  <li>3910	- Terminating the Symbian OS View should no longer generate  &quot;Unhandled event loop exception&quot; errors </li>
-  <li>3916	- Updated Breakpoint documentation to clarify that the symbols for a module must be loaded before any breakpoints in that module can be resolved  (see 4004) </li>
-  <li>3952	- The debugger now correctly closes all processes when terminating a debug session </li>
-  <li>3966	- Added support for the debug traces for emulator (epocwin.out) and COM port to the Console view</li>
-  <li>3975	- The Variables view no longer displays strange  &quot;.sw&quot; variables<br />
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11096">11096</a> - Resolved a crasher where the number of binaries being debugged exceeded the stop-mode limit allowed.<br />
 </li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Fri May 28 16:01:18 2010 -0500
@@ -2,15 +2,25 @@
 
 <html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 	<title>Carbide.c++ User Guide</title>
     <link href="../book.css" rel="stylesheet" type="text/css">
 	<style>
 		table, td, th { border: 0px none #FFF; }
-	</style>
+	body,td,th {
+	font-size: 1em;
+}
+body {
+	background-color: #CCCCCC;
+}
+    .style1 {
+	font-size: 2em;
+	font-weight: bold;
+}
+    </style>
 </head>
 
-<body background="images/background_carbide.jpg" >
+<body >
 <p>&nbsp;</p>
 <table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
   <tr>
@@ -18,14 +28,14 @@
     <td width="294" valign="bottom"><p align="right"><b><img src="images/brandmark_cpp.gif" width="106" height="52"></b></p>
       <p align="right">&nbsp;</p>
       <p align="right">&nbsp;</p>
-      <p align="right">&nbsp;</p>
       <p class="titleSmall">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
       License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
     </td>
   </tr>
   <tr>
-    <td colspan="2"><h1 align="center">Carbide.c++ User Guide</h1>
-    <p align="center" class="titleSmall">Version 3.0.0b, Apr, 2010</p></td>
+      <td colspan="2"><div align="center" class="style1">Carbide.c++ User Guide
+      </div>
+        <p align="center" class="titleSmall">Version 3.0.0, May, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/about.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/about_cpp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/background_carbide.jpg has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/gold_header.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Fri May 28 16:01:18 2010 -0500
@@ -8,15 +8,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link href="../book.css" rel="stylesheet" type="text/css" />
   <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-  <style type="text/css">
-.style1 {font-family: "Courier New", Courier, mono}
-.style5 {color: #FF0000}
-.style6 {font-weight: bold}
-.style8 {color: #000000; font-weight: bold; }
-  </style>
 </head>
 <body bgcolor="#ffffff">
-<h2>Carbide.c++ Release Notes 2.6.0</h2>
+<h2>Carbide.c++ Release Notes 3.0.0</h2>
 <p>The Carbide.c++  is a comprehensive development tool suite for Symbian OS that is based on the Eclipse framework. The C++ Development Toolkit (CDT), provides the foundation for project and build tools management, as well as the primary interface for the debugger to communicate with the IDE. </p>
 <p>This is a collection of important information concerning last-minute
   changes and other topics that deserve special attention.&nbsp;Please
@@ -26,7 +20,8 @@
 <ul>
   <li><a href="#whatsNew">What's new </a></li>
   <li><a href="#beta">User notes</a></li>
-  <li><a href="bugs_fixed.htm">Fixed bugs</a> and <a href="#issues">workarounds</a></li>
+  <li><a href="bugs_fixed.htm">K</a><a href="#issues">nown issues</a></li>
+  <li><a href="bugs_fixed.htm">Bug Fixes</a></li>
   <li><a href="#support">Technical support</a> </li>
 </ul>
 <p>Once you have read the release notes, we recommend you follow the <img src="images/command_link.png" width="16" height="12" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.getStarted)")'>HelloWorld tutorial</a> for
@@ -34,11 +29,33 @@
 <p class="note" style="color: rgb(255, 0, 0);"><span style="font-weight: bold;">WARNING</span>:
 Updating the CDT feature in Carbide.c++/Eclipse will wipe out our
 changes making the tools unusable!</p>
-<p> See the <a href="hints_tips.htm">Tips &amp; tricks</a> page for more helpful information.</p>
-<h3><a name="whatsNew" id="whatsNew"></a>What's New in 2.6.0 </h3>
+<h3><a name="whatsNew" id="whatsNew"></a>What's New in 3.0.0 </h3>
 <p>The following features for Symbian  development are provided within Carbide.c++:</p>
 <ul>
-  <li><b>Nada </b> supported &mdash; ???</li>
+    <li><b>Eclipse 3.6 </b>&#8212; The Eclipse 3.6 project (Helios) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.6</a> for more information.</li>
+    <li><b>CDT 7.0 </b>&#8212; The final version of CDT is included as part of the Helios release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn70">CDT 7.0 News and Noteworthy</a> page for more information.    </li>
+    <li><strong>Eclipse Debugger for C/C++</strong><strong> </strong>&mdash; Carbide now uses the <strong>Eclipse Debugger for C/C++</strong> (EDC) as its default debugger. EDC provided an entirely new Debug view with all of the standard debug features like variables, breakpoints, watchpoints, disassembly, and all the other views required to run a debugging session. In addition, EDC provides the framework to add new debug features like snapshots.</li>
+  <li><strong>Customized Carbide environment</strong>  &mdash; Carbide introduces Plugin Discovery Sites where you can search for and download Carbide plugins to customize your Carbide environment. Think of it as an app store for plugins. It uses the Eclipse P2 feature  to provide a common framework for finding, installing, updating, and removing plugins from the Carbide environment.</li>
+  <li><strong>Improved UI</strong> &mdash; Carbide's UI has been streamlined and minimized to a core set of functionality, mainly that of creating Symbian projects, building and debugging them. Context menus have been reworked to show a minimum set of options. If your favorite option is missing, you can use the <strong>Capability</strong> preference panel or the <strong>Customize Perspective</strong> dialog to add favorite commands back onto the context menus.</li>
+  <li><strong>Performance improvements</strong>  &mdash; We continue to address known performance issues as they reveal themselves. This release provides improvements for:
+      <ul>
+          <li><strong>Stack frames</strong>   &mdash; in the Debug view stack frames were displayed once the symbol tables were completely read. For large symbol files this sometimes slowed down the display and hence the ability to continue debugging. Now the Debug view will show a subset of stack frames after a set time and update the remainder once it has finished scanning the symbol file.</li>
+          <li><strong>Executables view</strong>   &mdash; eliminated several use cases that forced the Executables list to update to frequently.</li>
+          <li><strong>Large symbol tables</strong> supported &mdash; The Carbide symbol reader has been rewritten to provide faster access to symbols and to handle very large symbol files (larger than 10GB).</li>
+        </ul>
+  </li>
+</ul>
+<h4><a name="new260" id="new260"></a>2.6.0 </h4>
+<ul>
+    <li><b>GCCE 4.0 </b> supported &mdash; required for future SBSv2 releases.</li>
+    <li><b>Symbian^3 </b>supported &mdash; new templates and improvements required for the public Symbian^3 SDK.</li>
+    <li><b>Known Issues in v2.6.0</b>:
+        <ul>
+                <li>GCCE4 support requires using a SBSv2 build alias (<span class="code">-c</span> parameter) of <span class="code">armv5_udeb_gcce</span> or <span class="code">armv5_urel_gcce</span>. As of this writing, these aliases were not available in the SDK or SBSv2, but will appear in some future version. Carbide versions prior to 2.6 do not support GCCE4.</li>
+            <li>Users should consult the SDK documentation for GCCE and SBSv2 issues and installation requirements.</li>
+            <li>TRK: If you install the TRK app onto your phone's flash memory (Mass Storage) a Remote Connection may not find the TRK-service even though TRK is already connected to your PC.         Workaround: Uninstall TRK then reinstall it onto your PHONE memory (C-drive). The TRK service should now be &quot;Available&quot;.</li>
+        </ul>
+    </li>
 </ul>
 <h4><a name="new250" id="new"></a>2.5.0</h4>
 <ul>
@@ -54,353 +71,11 @@
   <li><b>RVCT 4.0 (ARMv5)</b> builds and some limited debugging is supported</li>
   <li><b>Symbian ^3 SDK</b> now supported</li>
 </ul>
-<h4><a name="new240" id="new240"></a>2.4.0</h4>
-<ul>
-  <li>    <span class="style5"><b>IMPORTANT WINSCW COMPILER</b></span> change - the WINSCW compiler 3.2.5 build 487  provides new name mangling to support critical exception handling. Without this change an exception can cause a program or system crash. For more information visit the <a href="http://developer.symbian.org/wiki/index.php/WINSCW_(build_version_information)">WINSCW</a> wiki page.</li>
-  <li><b>Qt Tools 1.6</b> now supported.</li>
-  <li>The <b>Run builds concurrently</b> option in the <a href="reference/wnd_build_prefs.htm">Builds</a> preference panel now supports up to 50 concurrent build jobs, up from 4.</li>
-</ul>
-<h4><a name="new230" id="new230"></a>2.3.0</h4>
-<ul>
-  <li>P2 update services now supported. Updating Carbide.c++ should be more flexible and easier than before.</li>
-  <li>The official Qt code style is now included in the Code Style preference panel.</li>
-  <li>Single file compiles on Raptor are now supported.</li>
-</ul>
-<h4><a name="new220" id="new220"></a>2.2.0</h4>
-<ul>
-  <li><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</li>
-  <li><b>CDT 6.0 </b>&#8212; The final version of CDT included as part of the Galileo release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn60">CDT 6.0 News and Noteworthy</a> page for more information.</li>
-  <li><b>Java 6.0 </b>&#8212; Due to the above changes Carbide has also updated to use the Java Runtime Environment (JRE) 6.0. See <a href="http://java.sun.com/javase/6/webnotes/features.html">Java SE 6 Release Notes</a> page for more information.</li>
-  <li><b>SBSv2 arguments field</b> - added a text field to the <a href="reference/wnd_build_prefs.htm">Build &gt; SBSv2</a> panel to allow parameter passing to Raptor builds.</li>
-  <li><b>Carbide.c++ News Reader</b> - now uses  the proxy data provided by Eclipse when creating help connections.</li>
-</ul>
-<h4><a name="new210" id="new210"></a>2.1.0</h4>
-<ul>
-  <li><b>Performance improvements</b> - the following areas of Carbide have been optimized to improve performance:
-    <ul>
-      <li><b>Importing large projects</b>   - Importing large projects is one of our primary points of performance improvements. When too many project roots were used the more source and include paths were brought into the project, up to an including entire SDKs. Generally, we found that once a project root contains over 15-20K files Carbide became extremely sluggish. We have improved some edge cases where project roots were calculated incorrectly and now include only what's really needed. </li>
-      <li><b>Modifying Project Settings and Build Configuration Data</b>-    This is quite a significant improvement as modifying MMP files and switching build configurations are a couple of the most common operations done by end-users and because the time spent processing project and configuration data is done on the main thread, locking the UI. With optimization in one CDT function we were able to bring most project-related and configuration switch changes from 20 seconds to less than 3 seconds. You should also see improvements when saving MMP and INF files (the &quot;Refreshing Configuration Job&quot;). </li>
-      <li><b>Executables View Refreshing</b> - The Executables view refresh was impacting everything from IDE start-up to import and project creation as well refreshes during rebuilds. Some of our wall clock tests on large projects (such as contacts the browser) show the executables job running from 15-25 seconds down to about 5 seconds.</li>
-      <li><b>Indexing Options</b>  - Use the <b>Indexing Options</b> section in the <a href="reference/wnd_carbide_pref.htm">Carbide.c++</a> preference panel to control how  project MMP files are indexed.</li>
-    </ul>
-  </li>
-  <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <a href="projects/launch/wiz_new_launch_config.htm#CATEGORY">Category Selection</a> page which helps guide developers in choosing the correct launch configuration  for a project, whether it be for Phones, Boards, or other target devices. In addition, the <a href="projects/launch/wiz_new_launch_config.htm#BLD_OPT">Build Options Selection</a> page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
-  <li><b>Customization (.bsf) and Symbian Variant Binary (.var) platform</b> discovery is now supported. See the Platform Filtering Preference panel for details.</li>
-  <li><b>TRK improvements</b> - TRK continues to evolve and now includes these improvements:
-    <ul>
-      <li>TRK now automatically reconnects if you disconnect the USB cable and then reconnect.</li>
-      <li>Added support for targeting nested static libraries of a polymorphic dll. </li>
-      <li>TRK now checks for  duplicates before adding a library to the target list to avoid sending duplicate library loading commands (bug 9035).</li>
-      <li>Users no longer need to specify a port number for Bluetooth connections as TRK now automatically locates BT serial port and uses that for the connections setup (bug 2502).</li>
-    </ul>
-  </li>
-  <li><b>Keywords in preference panels and property pages</b> - All Carbide related preference panels and project property pages now include keywords to make searching for options a bit easier.</li>
-  <li><b>New Carbide Extensions section</b> - Project Property dialogs now include a <b>Carbide Extensions</b> section which allows Carbide plug-in and utilities a place to add their own project  settings pages.</li>
-</ul>
-<h4>2.0.4</h4>
-<ul>
-  <li><b>Hover Help</b> - hover your pointer over a recognized Symbian symbol in an editor and see the Symbian API Reference information appear to assist you.</li>
-</ul>
-<h4>2.0.3</h4>
+<h3><a name="issues" id="issues"></a>Known issues</h3>
+<p>Workarounds for known issues: </p>
 <ul>
-  <li><b>Carbide.c++ News Reader</b> - introducing the <a href="reference/view_carbide_news.htm">Carbide.c++ News</a> view which provides the latest Carbide, Symbian, and S60 news as well as news on tools updates and screencasts for Carbide development.</li>
-</ul>
-<h4>2.0.0</h4>
-<ul><li><b>Eclipse 3.4.1 </b>&#8212; The Eclipse 3.4 project (Ganymede) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.4</a> for more information.</li>
-</ul>
-<ul><li><b>CDT 5.0.1</b> &#8212; The final version of CDT included as part of the Ganymede release. See the <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm">CDT 5.0 News and Noteworthy</a> page for more information. </li>
-  <li><b>SDK Migration support in CodeScanner</b> &#8212; CodeScanner now includes support for S60 SDK rules that provide helpful migration information on S60 functions within any C/C++ editor view and provide links to additional information within the SDK documentation or web. Very helpful during development to keep you code up-to-date with the latest SDK revisions.</li>
-  <li><b>Qt SDK for S60  support </b>&#8212; Carbide now <a href="qt_help/qt_overview.htm">supports</a> the <a href="qt_help/qt_importing_projs_01.htm">importing</a> and <a href="qt_help/qt_creating_projs_01.htm">creation</a> of Qt projects using the  <a href="http://trolltech.com/developer/technical-preview-qt-for-s60">Qt SDK for S60</a>.</li>
-  <li><b>Executables view improvements</b> &#8212; The <a href="reference/view_executables.htm">Executables</a> view now supports the loading of some additional DLL cases to ensure that the DLLs you want to debug are available during a debug session. In addition,  a Remove button has been added to the view's toolbar that makes it easier for you to remove any executables from the list.</li>
-  <li><b>More indexer improvements </b>&#8212; Speed improvements for code completion, syntax coloring, and much more.</li>
-  <li><b>Remote Connections view</b> &#8212; A visual list of <a href="reference/trk/view_remote_connection.htm">remote connections</a> and their state for managing multiple and diverse device connections.</li>
-  <li><b>Partial upgrade SIS file support</b> &#8212; Carbide now supports the generation of partial upgrade SIS/SISX files. This increases debugger turnaround by only generating new files for changes and uploading these smaller executables to the device.</li>
-  <li><b>More Program Counter support </b>&#8212; Added a Move to Line command for the debugger that enables you to move the PC to a new line while debugging without executing any intermediate lines or resuming execution.</li>
-  <li>Multiple<b> TRK</b> improvements including:
-    <ul>
-      <li>Both App and System TRK try to disable mobile crash debugging</li>
-      <li>TRK now looks for the new mobile crash agent (ms_useragent)</li>
-      <li>Added additional error checking when communicating over USB to improve stability</li>
-      <li>Fixed some random TRK deadlocks when reading registers or when thread panics occur</li>
-      <li>Option &gt; Exit has been replaced by Option &gt; Back to reflect the change made to exiting TRK</li>
-      <li>Changes made to use UIDs in place of component names to identify executables for improved identification</li>
-      <li>Reset TRK priority to high to avoid problems debugging complex process intensive applications</li>
-      <li>Improved breakpoint location in DLLs when debugging multiple processes</li>
-      <li>TRK no longer targets processes with UID 0 automatically. Users can still attach to the process or use a launch configuration.</li>
-      <li>TRK application name and UID changed to blocking of TRK SIS files assigned with the old UID.</li>
-      <li>TRK now always uses the kernel APIs to read/write memory to improve security, no more direct reads/writes.</li>
-      <li>Application TRK  no longer allows write operations to the following registers: CPSR, SP, and LR</li>
-    </ul>
-  </li>
-</ul>
-<h4>1.3.1</h4>
-<ul>
-  <li><b><a href="reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> </b> dialog &#8212; connects, verifies and updates Carbide software services like the TRK debug agent on a device to ensure you are always using the latest version in your development efforts. Having trouble connecting with  TRK, give this a try. </li>
-  <li><b>New Bug Report wizard  </b> &#8212; directly submit bugs and enhancement requests  to  Carbide Bugzilla from within Carbide using the <strong>Help &gt; New Bug Report</strong> menu option. Enter the name and password into the Bug Reporter preference panel and quick bug reports are easy to submit. </li>
-  <li><strong>Launch configuration panels UI unification and improvements</strong>&#8212; a host of minor UI improvements are being made in the launch configuration panes to provide a more coherent and reproducible experience across all launch configuration dialogs. </li>
-</ul>
-<blockquote>
-  <p>For example, the concept of a &quot;main executable&quot; had been replaced with the Executables tab where a list of executables targeted for debugging were shown. This UI change brings the launch configurations into sync with that change by removing the Main Executable from the Main tab. The Main tab will only show a process to launch and not executables targeted for debugging. </p>
-  <p>Another example, the Arguments field used by the run-mode TRK configurations has been moved to the Arguments tab to match the Emulator configuration.</p>
-</blockquote>
-<ul>
-  <li>Many other bug fixes to improve stability and usability on Carbide </li>
-</ul>
-<h4>1.3.0</h4>
-<ul>
-  <li><b>Eclipse 3.3.1.1</b> &#8212; The Eclipse 3.3 project provides the foundation, or integration platform, for which the product is built upon. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.3</a> for more information.</li>
-  <li><b>CDT 4.0.1</b> &#8212; This drop is based on a final version of CDT that was part of the Europa release. See the <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm">CDT 4.0 News and Noteworthy</a> page for more information. </li>
-  <li><b>Build system improvements</b> &#8212; large project support has been enhanced for builds and indexing, but performance trade offs have been made so the latter improvements are possible. This is most noticeable when importing projects and making changes to <span class="code">bld.inf</span> and <span class="code">mmp</span> files.</li>
-  <li><b>System search</b> &#8212; search any directory outside the workspace. </li>
-  <li><b>Debugging improvements include:</b>
-    <ul>
-      <li><b>Executables view</b> &#8212; provides a dynamic list of executables and their related source files </li>
-      <li><b>Executables tab</b> &#8212; uses a rule based approach in launch configurations  to include/exclude executables in the project </li>
-      <li><b>On-device debugging</b> &#8212; lots of TRK  (v2.8.6) fixes here to make on-device debugging easier and more stable </li>
-    </ul>
-  </li>
-  <li><b>Carbide tool plug-ins include</b>:
-    <ul>
-      <li>CodeScanner - a static source code analysis tool for Symbian OS programs written in C++</li>
-      <li>Capability Scanner and Epocwind.out Scanner - performs static and runtime capability checks on your project </li>
-      <li>Dependency Explorer - analyses static dependencies between  components</li>
-    </ul>
-  </li>
-  <li><b>Indexing improvements</b></li>
-  <li>The creation of EKA1-based projects has been deprecated with this release. Carbide still supports its use but all development going forward will concentrate on EKA2-based projects. </li>
-  <li><b>Lots of bug fixes</b>... </li>
-</ul>
-<h3><a name="beta" id="beta"></a>User Notes</h3>
-<ul><li><b>New extension makefiles</b> - if your project is using the new extension makefile support in OS9.3+ (<span class="code">prj_extensions</span>), you will get a build error with the default builder settings.  We plan to fix this issue, but for now you can work around it by disabling the manage dependencies and concurrent compilation builder options found in the <b>Carbide.c++ &gt; Build</b> preference panel.</li>
-  <li><b>Qt for Symbian support</b> - The Qt views require registered COM plugins in order to work correctly.  These plugins are registered by our installer.  If you did not use our installer or have uninstalled an existing Qt Eclipse integration after installing Carbide, you'll need to register the plugins by running a batch file.  You'll find the batch file here: \configuration\qt\register_plugins.bat.  You'll know that you need to run the batch file if you get exceptions when opening one of the Qt views.</li>
-</ul>
-<h3><a name="issues" id="issues"></a>Fixed bugs and workarounds</h3>
-<ul>
-  <li>Complete list of Carbide.c++ <a href="bugs_fixed.htm">bugs fixed</a></li>
-  <li>Workarounds for known issues: </li>
+    <li><strong>Qt issues</strong> &mdash; If Qt does not seem to be working as expected, be sure to run the <span class="code">\configuration\qt\register_plugins.bat</span> file to properly register the Qt plugins. This is especially important if you installed Carbide using a zip file and not an installer.</li>
 </ul>
-<table cellpadding="0" cellspacing="0" border="0" style="text-align: left; width: 100%;">
-  <tbody>
-    <tr>
-      <th 
- style="vertical-align: top; text-align: center; font-weight: bold; ">Summary<br />      </th>
-      <th 
- style="vertical-align: top; text-align: center; font-weight: bold; ">Workaround</th>
-    </tr>
-    <tr align="center">
-      <td colspan="2" bgcolor="#FFFFCC"><b><a name="pnpIssues" id="pnpIssues"></a>KNOWN PnP ISSUES in 2.5</b></td>
-    </tr>
-    <tr align="center">
-      <td><div align="left">Connecting multiple devices</div></td>
-      <td><div align="left">If multiple devices are plugged into USB, Carbide sometimes cannot determine the USB personality of either or both devices. Carbide will log an error that says the &quot;getting/setting of USB personality&quot; was not supported and no connection is created. The work-around is to plug only one device in.</div></td>
-    </tr>
-    <tr align="center">
-      <td><div align="left">Multiple same error warnings</div></td>
-      <td><div align="left">
-        <p>If a single device is plugged in, and Carbide logs the same error, this is an indication that either </p>
-        <p>A. the PCSuite/OVISuite drivers are not up-to-date or </p>
-        <p>B. the device does not support switching to PC/OVI Suite mode from its current mode </p>
-        <p>For case A, try installing a later version of PCSuite. For case B, set the default USB mode to PC/OVI Suite mode in the settings on the device or selecting PC/OVI Suite mode when the device asks which USB mode to select.</p>
-        </div></td>
-    </tr>
-    <tr align="center">
-      <td><div align="left">PC Suite fails to send updates</div></td>
-      <td><div align="left">On some devices, when unplugging and plugging back in the same USB mode, PC Suite will fail to notify that the device disconnected and the personality switch bubble will not pop up. As a work-around, change the default mode and plug in the device again.</div></td>
-    </tr>
-    <tr align="center">
-      <td colspan="2" bgcolor="#FFFFCC"><a name="CRITICAL_ITEMS"></a><span class="style8">CRITICAL ITEMS</span></td>
-    </tr>
-    <tr>
-      <td class="style5" style="vertical-align: top;"><b>WARNING:</b> The C/C++ Files view is a view of the actual FILE SYSTEM, so anything deleted in this view is also deleted from the file system. </td>
-      <td style="vertical-align: top;"><p>When deleting projects from the workspace please be sure you read the dialog that describes the  files that will be deleted. Select the &quot;Do not delete files&quot; option to keep them in the file system.</p>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;"><span class="style5">Carbide.c++ terminates on startup on low memory machines</span></td>
-      <td style="vertical-align: top;"> <p>Machines with less than 1GB of memory (or machines running in a virtual machine) may experience start-up problems. Error dialog typically contains: </p>
-        <p><span class="code">JVM terminated, Return code = -1 </span></p>
-        <p>or when running from eclipse.exe: </p>
-        <p><span class="code">Error occurred during initialization of VM  Could not reserve enough space for object heap</span> </p>
-<p>The <a href="hints_tips.htm">solution</a> is to edit your <span class="code">Carbide.c++.2.x.ini</span> (or <span class="code">eclipse.ini</span> if launching <span class="code">Eclipsec.exe</span>) and use a smaller value for the <span class="code">-Xmx </span>parameter to the JVM. </p>
-<p class="note"><b>NOTE</b> In this scenario, Carbide.c++ performance may degrade.</p></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[4587] Unable to build  GCCE targets on Vista because of makefile error.</td>
-      <td style="vertical-align: top;"><p>There are known tooling issues when building for the GCCE platform under Windows Vista that can prevent a GCCE build from occurring.  If you want to build for GCCE under S60 and UIQ you will need to manually update some files under<span class="style1"> \epoc32\tools\</span>. See the article <a href="http://wiki.forum.nokia.com/index.php/Windows_Vista">Windows Vista</a> for up-to-date workaround information.</p>
-      <p><b>UPDATE 2010</b>: SDKs still require patching to enable GCCE builds.</p></td>
-    </tr>
-    <tr bgcolor="#0071ff">
-      <td colspan="2" bgcolor="#FFFFCC" style="vertical-align: top;">
-      <div align="center" class="style6"><a name="bug_ide"></a><span class="style8">IDE</span></div>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Debugging a project on a machine running Vista via &quot;Remote Desktop Connection&quot; does not work. </td>
-      <td style="vertical-align: top;">Workaround: Switch the project to a machine running Windows XP in order to use &quot;Remote Desktop Connection&quot;. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[6414] Using Mylyn causes MMP files to be spell checked and common terms like EXE, CPP, and EUSER.LIB flagged as misspellings in editor views </td>
-      <td style="vertical-align: top;"><p>Workaround: Remove Mylyn from the Carbide installation. </p>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">The C/C++ Editor will only work properly with files inside project source folders or on include paths. Source folders are configured in the project settings on the C/C++ Project Paths &gt; Source tab. </td>
-      <td style="vertical-align: top;">When creating new folders, use File &gt; New &gt; Source Folder. This will add a folder and mark it a source folder. If you need to import copies of existing files (File &gt; Import &gt; File System) or link to existing sources (File &gt; New &gt; Folder with &quot;Link to folder in file system&quot;), then a normal folder will be created, not a source folder. If the folder is not underneath an existing source folder in the project, you will need to manually mark it as a source folder using the C/C++ Project Paths &gt; Source tab. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[3010] Bad synchronization in MMP editor for Linker definition file.</td>
-      <td style="vertical-align: top;">  The templates for Symbian DLL projects do not define a <span class="code">DEFFILE</span> statement, for the case where a <span class="code">DEF</span> file is not needed or imports are not frozen. If you edit the <span class="code">DEF</span> filename through the MMP editor, it is not automatically conditioned for the current target. If you wish to define target-specific <span class="code">DEF</span> file names in the MMP editor, manually insert <span class="code">#ifdef...#endif</span> blocks, or first uncomment the <span class="code">#ifdef...#endif</span> block from the template, so that target-specific filenames will be properly updated.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[2784] Changes to contents of <span class="code">#includes</span> of bld.inf and MMP files are not performed -- instead, changes involving reordering or deleting go to the main file. </td>
-      <td style="vertical-align: top;">Workaround: if making changes to nests of included files, either manually edit the <span class="code">#included</span> files, or if using MMP or bld.inf editors, look for changes in the main bld.inf or MMP file and manually fix them up.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Indexer coloring for problems</td>
-      <td style="vertical-align: top;">The problems marker for the indexer occasionally reports both false negative and false positive results (see indexer bugs below). The problems color by default is set to a dark gray to suggest a possible ambiguous state of the browser. You can change this color under the global preferences page: Syntax Coloring. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[4932] Indexer: Problems with templates </td>
-      <td style="vertical-align: top;">C++ template navigation is not fully supported yet. Problem areas are notable when templates are declared outside the file they are used and when functions or macros use template declarations. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[4937, 4941] Indexer: Problems with macro navigation </td>
-      <td style="vertical-align: top;">Browsing to macro declarations is problematic when macros are used within function call parameters as well as multi-line macro declarations.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[4931] Indexer does not track files outside the workspace. </td>
-      <td style="vertical-align: top;">If you make changes to files outside the workspace the indexer will not re-index these files (e.g. .rsg files under the SDK). When in doubt, re-index your project. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[4906] Indexer: const parameters get lost in function prototypes occasionally</td>
-      <td style="vertical-align: top;">The indexer sometimes loses the parameter of function types for const objects. In these cases code navigation will not work. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Target type macros (__EXE__, __DLL__, etc) are not always defined for the CDT indexer.</td>
-      <td style="vertical-align: top;">The CDT indexer macros are build configuration specific.  There could be multiple mmp's for a build configuration, each with a different target type macro.  Therefore the target type macro is only added if there is only one mmp file, or if all of the mmp's have the same target type macro.  You can manually add the macro if you wish using the C/C++ Include Paths and Symbols project property page.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">The C/C++ Projects  and Symbian Project Navigator views do not always refresh with changes in the file system.</td>
-      <td style="vertical-align: top;"> If you are in doubt about the contents select the folder in question, then hit F5 to refresh the directory from the file system.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Synergy 6.3 Installations will always crash Eclipse file navigation dialogs - The solution for this is to un-register cmexplorer.dll then reboot your machine. Un-registering this feature will only effect users that use Synergy integration to Windows Explorer. This issue is known to be fixed with Synergy 6.4.</td>
-      <td style="vertical-align: top;">The un-register command is:<br />
-      <br />
-      <font size="-1"><span class="code"
- style="font-family: courier new,courier,monospace;"> regsvr32 /u
-&lt;path to dll&gt;cmexplorer.dll</span> &nbsp; <br />
-      <br />
-      </font>To re-register, the command is:<br />
-      <br />
-      <font size="-1" class="code">regsvr32 &lt;path to
-dll&gt;cmexplorer.dll</font></td>
-    </tr>
-    <tr bgcolor="#0071ff">
-      <td colspan="2" bgcolor="#FFFFCC" style="vertical-align: top;">
-      <div align="center" class="style6"><a name="bug_build"></a><span
- class="style8">BUILD/IMPORTER</span></div>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[3809]<b> IMPORTANT</b>: You cannot import two projects into Carbide that have the same &quot;Root Directory&quot;.</td>
-      <td style="vertical-align: top;"> If a .project file already exists in this location you either need to shorten or lengthen the &quot;Root Directory&quot; or delete the other project in the same location and try to import again.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;"><p>Emulator (WINSCW) command line builds</p></td>
-      <td style="vertical-align: top;"><p>If you want to build for the emulator from the command line, run the tool from the start menu shortcut: <strong>Configure environment for WINSCW command line builds</strong>. It will setup the necessary environment variables for the x86 compiler. You do not need to do this if you will only be building emulator targets  from the IDE.</p></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Working with a workspace on one drive and a source base on another can build some items in the wrong location. </td>
-      <td style="vertical-align: top;">Workaround:  keep your source base and Carbide workspace on the same drive. Because some scripts work off an implicit root (e.g. \epoc32\include\) and don't support drive specs on paths there can be outputs to unexpected locations. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">When creating/importing projects the sources and SDK must be on the same drive.</td>
-      <td style="vertical-align: top;"> <p>For example, you cannot create a project on the C: drive and build with an SDK whose <span class="code">EPOCROOT</span> is <span class="code">M:\</span>.</p>
-      <p>      This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. <span class="code">\epoc32\tools</span>).</p></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Files that include non-ascii
-character types will not compile correctly with GCCE if the file type
-is not saved as UTF-8. </td>
-      <td style="vertical-align: top;">The workaround is to change the
-text file encoding in the global preferences at Windows &gt;
-Preferences, then open the General &gt; Editors panel in the
-Preferences window. Look for the Text file encoding option as shown
-below.
-      <p align="center"><img src="images/utf.png" width="212" height="68" alt="" /></p>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Build system does not detect static library dependencies</td>
-    <td style="vertical-align: top;">The Symbian OS build system did not detect static library changes prior to 9.2.  They have release a patch for this <a href="http://www3.symbian.com/faq.nsf/0/E0F5C56AA68C305F8025731400051166?OpenDocument">here</a>.    </tr>
-    <tr bgcolor="#0071ff">
-      <td colspan="2" bgcolor="#FFFFCC" style="vertical-align: top;">
-      <div align="center" class="style6"><a name="bug_debug"></a><span
- class="style8">DEBUGGER</span></div>      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Unable to install TRK on flashed  devices</td>
-      <td style="vertical-align: top;"> Workaround: Some  devices contain images that won't allow TRK to be installed, specifically the Lumiere PR 1.0 and PR 1.1 releases, especially if the C drive image was flashed. To install TRK on these devices you must format the C drive to remove the old flash image, then reflash using an image containing TRK.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[3778,4658] Some variables show &quot;Invalid format&quot; in the Variable view. </td>
-      <td style="vertical-align: top;">No Workaround. </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Symbian OS Data view caveats. </td>
-      <td style="vertical-align: top;"><p>During crash debugger launch session, you can examine Symbian OS data (processes, threads, chunks etc) in Symbian OS Data view. But:</p>
-        <p> (1) You must have Symbian kernel debugger (usually <span class="code">Kdebug.dll</span>) built in the image. </p>
-      <p> (2) As getting the OS data from crash debugger is time consuming (takes more than one minute in our test), auto-refresh of the data in Symbian OS Data view is disabled for crash debugger. You need to click the &quot;Refresh&quot; button to do a manual refreshing.</p></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[2960] The thread run control icons (step over, step in, run) are sometimes disabled after stepping</td>
-      <td style="vertical-align: top;"> Click on the top frame of the suspended thread in the Debug view</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">Debugging without restarting the emulator.</td>
-      <td style="vertical-align: top;"> <p>If you modify any resource files resulting RSC files cannot be rebuilt, however CPP source files can. There are a couple of issues you should be aware of. </p>
-        <p>1) When starting a build, the debugger releases all file handles to the debugged application. Sometimes the emulator is slow to release its own handles to files after quitting an application. If a file is still locked on a rebuild make sure the application is closed (not the emulator itself), wait a few seconds, and try again. </p>
-      <p> 2) When setting breakpoints in source files that have been recompiled they do not always resolve correctly while the emulator is running. The best option is to clear the breakpoints in any modified file and set them again.</p></td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[2716] [Variable View] - Sometimes when
-stepping through a loop
-variables do not refresh.</td>
-      <td style="vertical-align: top;">If you have refresh problems
-with variables, put focus on the variables pane, then off the pane and
-back onto the variable pane.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[1928] [Register View] Casting
-Registers to any type does not work.</td>
-      <td style="vertical-align: top;">Not currently supported.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">The value of some uninitialized
-variables is shown as
-"Unknown error ...."</td>
-      <td style="vertical-align: top;">When
-variables are in scope the proper value will be displayed.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[548] [Variable Scoping] - Multiple
-variables with the same name
-in subscopes are not displayed properly.</td>
-      <td style="vertical-align: top;">Give variables unique names.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[971] Watchpoints cannot be set on
-global variables declared in header files. </td>
-      <td style="vertical-align: top;">No workaround.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[1959] Expressions cannot be disabled.</td>
-      <td style="vertical-align: top;">No workaround.</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;">[Add Global Variables] Not all
-global namespace variables are displayed or duplicate entries sometimes
-appear. </td>
-      <td style="vertical-align: top;">No workaround.</td>
-    </tr>
-  </tbody>
-</table>
 <h3><a name="support" id="support"></a>Technical support </h3>
 <p>The following support services are available:</p>
 <ul><li>Visit the <a href="http://web-dev.foundationhost.org/">Symbian Foundation</a> for Carbide.c++ and Symbian development information </li>
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Fri May 28 16:01:18 2010 -0500
@@ -1022,6 +1022,9 @@
 		if (!bldInfoFile.exists())
 			return;
 		
+		if (getOSVersion().getMajor() == 0)
+			setOSVersion(new Version("9.5.0"));  // Set a default version that will work with all EKA2
+		
 		try {
 			char[] cbuf = new char[(int) bldInfoFile.length()];
 			Reader reader = new FileReader(bldInfoFile);
@@ -1038,12 +1041,16 @@
 				if (line.startsWith(BUILD_INFO_KEYWORD)){
 					String[] versionTokens = line.split(" ");
 					if (versionTokens.length == 3){
-						
-						if (versionTokens[2].toUpperCase().startsWith("TB92SF") || versionTokens[2].toUpperCase().endsWith("TB92SF")){
+
+						if (versionTokens[2].toUpperCase().contains("TB92SF")){
 							setOSVersion(new Version("9.5.0"));
 							setSDKVersion(new Version("5.2.0"));
 							break;
-						} else if (versionTokens[2].toUpperCase().startsWith("TB101SF") || versionTokens[2].toUpperCase().endsWith("TB101SF")){
+						} else if (versionTokens[2].toUpperCase().contains("TB101SF")){
+							setOSVersion(new Version("9.6.0"));
+							setSDKVersion(new Version("6.0.0"));
+							break;
+						} else if (versionTokens[2].toUpperCase().contains("TB102SF")){
 							setOSVersion(new Version("9.6.0"));
 							setSDKVersion(new Version("6.0.0"));
 							break;
@@ -1052,24 +1059,6 @@
 							int index = versionTokens[2].lastIndexOf("v");
 							String osVersionString = versionTokens[2].substring(index+1, versionTokens[2].length());
 							
-							if (osVersionString.compareToIgnoreCase("tb91sf") == 0){
-								setOSVersion(new Version("9.4.0"));
-								setSDKVersion(new Version("5.1.0"));
-								break;
-							}
-							
-							if (osVersionString.compareToIgnoreCase("tb92sf") == 0){
-								setOSVersion(new Version("9.5.0"));
-								setSDKVersion(new Version("5.2.0"));
-								break;
-							}
-							
-							if (osVersionString.compareToIgnoreCase("tb101sf") == 0){
-								setOSVersion(new Version("9.6.0"));
-								setSDKVersion(new Version("6.0.0"));
-								break;
-							}
-							
 							if (osVersionString.endsWith(EKA1_A_BRANCH_IDENTIFIER) || 
 							    osVersionString.endsWith(EKA2_B_BRANCH_IDENTIFIER) ||
 							    osVersionString.endsWith(EKA1_S_BRANCH_IDENTIFIER)){
@@ -1081,9 +1070,14 @@
 							}
 							
 							// Set the version, split on alphanumeric to get rid of any junk at the end
-							String[] tempStr = osVersionString.split("[a-zA-Z]");
+							String[] tempStr = osVersionString.split("[a-zA-Z_]");
 							if (tempStr.length != 0){
-								setOSVersion(Version.parseVersion(tempStr[0]));
+								try {
+									setOSVersion(Version.parseVersion(tempStr[0]));
+								} catch (Exception e) {
+									// ignore, default version already set
+									// just catch exception so we move along to the next SDK
+								}
 							}
 						}
 					}
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Fri May 28 16:01:18 2010 -0500
@@ -236,11 +236,10 @@
 			public void widgetSelected(SelectionEvent e) {
 				// I don't see a way to open it to a specific tab, only the page
 				if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage", null, null, 0).open()){ //$NON-NLS-1$
+					
 					inited = false;
 					setVisible(true);
-					drawSDKConfigView(getControl().getParent());
-					TemplateSDKFilter filter = filterCheckbox.getSelection() ? templateFilter
-							: null;
+					TemplateSDKFilter filter = filterCheckbox.getSelection() ? templateFilter : null;
 					filteringContentProviderWrapper.setFilter(filter);
 					viewer.getTree().clearAll(true);
 					viewer.refresh();
@@ -255,11 +254,10 @@
 	
 	private void drawSDKConfigView(Composite parent) {
 		
-		if (viewer == null){
-			viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-			viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-			viewer.setLabelProvider(new LabelProvider());
-		}
+		viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setLabelProvider(new LabelProvider());
+		
 		TreeNodeContentProvider treeNodeContentProvider = new TreeNodeContentProvider();
 		filteringContentProviderWrapper = 
 			new FilteringContentProviderWrapper(treeNodeContentProvider);
Binary file core/com.nokia.carbide.cpp/html/images/s60_developers.jpg has changed
Binary file core/com.nokia.carbide.cpp/icons/about.png has changed
Binary file core/com.nokia.carbide.cpp/icons/about_cpp.png has changed
Binary file core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/brandmark.png has changed
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/brandmark.png has changed
Binary file core/com.nokia.carbide.discovery.ui/icons/icon-discovery.png has changed
--- a/core/com.nokia.carbide.search.system-feature/feature.xml	Mon May 24 15:37:56 2010 -0500
+++ b/core/com.nokia.carbide.search.system-feature/feature.xml	Fri May 28 16:01:18 2010 -0500
@@ -2,7 +2,7 @@
 <feature
       id="com.nokia.carbide.search.system"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Nokia"
       plugin="com.nokia.carbide.cpp"
       image="Carbide_Image.png">
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Fri May 28 16:01:18 2010 -0500
@@ -5,275 +5,472 @@
 
    <extension
          point="org.eclipse.ui.activities">
-  
-      <activity
-            name="Unused CDT UI"
-            description="These UI elements from CDT are not used and have been hidden using this capability"
-            id="com.nokia.carbide.cpp.debug.cdtactivity">
-      </activity>
-      
-<!-- The signals view is added to the debug perspective by CDT and therefore it
-	 tries to show the view no matter what.  Because we hide it here it fails to
-	 show the view properly and gives an error.  There is no way to remove it from
-	 the default debug perspective without modifying CDT.  We'll just leave it in
-	 for now, it won't have any content anyway.
-
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
-      </activityPatternBinding>
--->
 
 <!-- The following UI elements are from org.eclipse.cdt.launch -->
- 
+      <category
+            name="CDT - Launch UI"
+            description="CDT Launch UI Elements"
+            id="org.eclipse.cdt.launch.category">
+      </category>
+      <activity
+            name="CDT - Launch UI"
+            description="CDT Launch UI"
+            id="org.eclipse.cdt.launch.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.launch.activity"
+            categoryId="org.eclipse.cdt.launch.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.launch.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.launch/org.eclipse.cdt.cdi.launch.localCLaunch">
       </activityPatternBinding>
-
+       <activityPatternBinding
+            activityId="org.eclipse.cdt.launch.activity"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.launchGroup">
+      </activityPatternBinding>
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.dsf.gdb -->
+      <category
+            name="CDT - DSF GDB"
+            description="CDT DSF GDB Elements"
+            id="org.eclipse.cdt.dsf.gdb.category">
+      </category>
+      <activity
+            name="CDT DSF GDB UI"
+            description="CDT DSF GDB UI"
+            id="org.eclipse.cdt.dsf.gdb.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.dsf.gdb.activity"
+            categoryId="org.eclipse.cdt.dsf.gdb.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.dsf.gdb.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.localCLaunch">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.dsf.gdb.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch">
       </activityPatternBinding>
-
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.debug.core -->
+      <category
+            name="CDT - Core Debug Launch"
+            description="CDT Core Debug Launch"
+            id="org.eclipse.cdt.debug.core.category">
+      </category>
+      <activity
+            name="CDT - Core Debug Launch UI"
+            description="CDT Core Debug Launch"
+            id="org.eclipse.cdt.debug.core.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.core.activity"
+            categoryId="org.eclipse.cdt.debug.core.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.debug.core.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.postmortemLaunchType">
       </activityPatternBinding>
       
-       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            isEqualityPattern="true"
-            pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.launchGroup">
-      </activityPatternBinding>
-      
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.debug.core.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.attachLaunchType">
       </activityPatternBinding>
 
      <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           activityId="org.eclipse.cdt.debug.core.activity"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
+      </activityPatternBinding>
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.launch.remote -->
+      <category
+            name="CDT - Remote Launch"
+            description="CDT Remote Launch Elements"
+            id="org.eclipse.cdt.launch.remote.category">
+      </category>
+      <activity
+            name="CDT - Remote Launch UI"
+            description="CDT Remote Launch Elements"
+            id="org.eclipse.cdt.launch.remote.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.launch.remote.activity"
+            categoryId="org.eclipse.cdt.launch.remote.category">
+      </categoryActivityBinding>
+     <activityPatternBinding
+           activityId="org.eclipse.cdt.launch.remote.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.launch.remote/org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
       </activityPatternBinding>
-
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.examples.dsf.pda -->
+      <category
+            name="CDT - DSF PDA"
+            description="CDT DSF PDA Elements"
+            id="org.eclipse.cdt.examples.dsf.pda.category">
+      </category>
+      <activity
+            name="CDT - DSF PDA UI"
+            description="CDT DSF PDA Elements"
+            id="org.eclipse.cdt.examples.dsf.pda.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.examples.dsf.pda.activity"
+            categoryId="org.eclipse.cdt.examples.dsf.pda.category">
+      </categoryActivityBinding>
      <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           activityId="org.eclipse.cdt.examples.dsf.pda.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.examples.dsf.pda/org.eclipse.cdt.examples.dsf.pda.launchType">
       </activityPatternBinding>
-
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.debug.ui -->
+      <category
+            name="CDT - Debug UI"
+            description="CDT Debug UI Elements"
+            id="org.eclipse.cdt.debug.ui.category">
+      </category>
+      <activity
+            name="CDT - Debugger Local C Shortcut"
+            description="CDT Local C Shortcut"
+            id="org.eclipse.cdt.debug.ui.activity1">
+      </activity>
+      <activity
+            name="CDT - Debugger Types Preference Page"
+            description="CDT Debugger types preference page"
+            id="org.eclipse.cdt.debug.ui.activity2">
+      </activity>
+      <activity
+            name="CDT - Debugger Signals View"
+            description="CDT Debugger Signals View"
+            id="org.eclipse.cdt.debug.ui.activity3">
+      </activity>
+      <activity
+            name="CDT - Debugger Add Breakpoint Event Action"
+            description="CDT Debugger Add Breakpoint Event Action"
+            id="org.eclipse.cdt.debug.ui.activity4">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activity1"
+            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+      </categoryActivityBinding>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activity2"
+            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+      </categoryActivityBinding>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activity3"
+            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+      </categoryActivityBinding>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activity4"
+            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+      </categoryActivityBinding>
      <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           activityId="org.eclipse.cdt.debug.ui.activity1"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
       </activityPatternBinding>
-
      <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           activityId="org.eclipse.cdt.debug.ui.activity2"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
       </activityPatternBinding>
-
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.activity3"
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.activity4"
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.internal.ui.actions.AddEventBreakpointActionDelegate">
+      </activityPatternBinding>
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.debug.gdbjtag.core -->
+      <category
+            name="CDT - GDB JTAG Debug UI"
+            description="CDT GDB JTAG Debug UI Elements"
+            id="org.eclipse.cdt.debug.gdbjtag.core.category">
+      </category>
+      <activity
+            name="CDT - GDB JTAG Debug UI"
+            description="CDT GDB JTAG Debug UI Elements"
+            id="org.eclipse.cdt.debug.gdbjtag.core.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.gdbjtag.core.activity"
+            categoryId="org.eclipse.cdt.debug.gdbjtag.core.category">
+      </categoryActivityBinding>
      <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-           isEqualityPattern="true"
-           pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
-      </activityPatternBinding>
-
-     <activityPatternBinding
-           activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+           activityId="org.eclipse.cdt.debug.gdbjtag.core.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.debug.gdbjtag.core/org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
       </activityPatternBinding>
-
-
+<!-- -->
 <!-- The following UI elements are from org.eclipse.cdt.managedbuilder.ui -->
+      <category
+            name="CDT - Managed Builder UI"
+            description="CDT Managed Builder UI Elements"
+            id="org.eclipse.cdt.managedbuilder.ui.category">
+      </category>
+      <activity
+            name="CDT - Managed Builder UI"
+            description="CDT Managed Builder UI Elements"
+            id="org.eclipse.cdt.managedbuilder.ui.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
+            categoryId="org.eclipse.cdt.managedbuilder.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.wizards.ConvertToMakeWizard">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.wizards.NewMakeFromExisting">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.wizards.MakeProjFromExisting">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
             pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_MultiConfig">
       </activityPatternBinding>
 
-<!-- The following UI elements are from org.eclipse.cdt.make.ui -->
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.make.ui/org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
-      </activityPatternBinding>
-
-<!-- The following UI elements are from org.eclipse.cdt.ui -->
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard1">
-      </activityPatternBinding>
-
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard2">
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
+            pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.buildConfigToolbarAction">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.managedbuilder.ui.activity"
+            pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.buildConfigMenuAction">
+      </activityPatternBinding>
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.make.ui -->
+      <category
+            name="CDT - Make UI"
+            description="CDT Make UI Elements"
+            id="org.eclipse.cdt.make.ui.category">
+      </category>
+      <activity
+            name="CDT - Make UI"
+            description="CDT Make UI Elements"
+            id="org.eclipse.cdt.make.ui.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.make.ui.activity"
+            categoryId="org.eclipse.cdt.make.ui.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.make.ui.activity"
+            pattern="org.eclipse.cdt.make.ui/org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
+      </activityPatternBinding>
+<!-- -->
+<!-- The following UI elements are from org.eclipse.cdt.ui -->
+      <category
+            name="CDT - UI"
+            description="CDT UI Elements"
+            id="org.eclipse.cdt.ui.category">
+      </category>
+      <activity
+            name="CDT - UI for New* Wizards"
+            description="CDT UI for New* Wizards"
+            id="org.eclipse.cdt.ui.activity">
+      </activity>
+      <activity
+            name="CDT - Project Settings Actions"
+            description="CDT Project settings import and export actions"
+            id="org.eclipse.cdt.ui.activity2">
+      </activity>
+      <activity
+            name="CDT - Import Executable Action"
+            description="CDT Import executable action"
+            id="org.eclipse.cdt.ui.activity3">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activity"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activity2"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activity3"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activity"
+            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard1">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activity"
+            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard2">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activity"
             pattern="org\.eclipse\.cdt.*/.*NewProjectDropDown">
       </activityPatternBinding>
- 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.ui.activity"
             pattern="org\.eclipse\.cdt.*/.*NewTypeDropDown">
       </activityPatternBinding>
- 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.ui.activity"
             pattern="org\.eclipse\.cdt.*/.*NewFileDropDown">
       </activityPatternBinding>
- 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.ui.activity"
             pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
       </activityPatternBinding>
-      
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.ui.activity2"
             pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsImportWizard">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.ui.activity2"
             pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsExportWizard">
       </activityPatternBinding>      
-  
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activity3"
+            pattern=".*ImportExecutableWizard">
+      </activityPatternBinding>
+<!-- -->
 <!-- The following UI elements are from org.eclipse.debug.ui -->
+      <category
+            name="Platform Debug UI"
+            description="Platform Debug UI Elements"
+            id="org.eclipse.debug.ui.category">
+      </category>
+      <activity
+            name="Platform Debug UI"
+            description="Platform Debug UI Elements"
+            id="org.eclipse.debug.ui.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.debug.ui.activity"
+            categoryId="org.eclipse.debug.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*relaunch">
       </activityPatternBinding>
  
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.internal.ui.actions.AddEventBreakpointActionDelegate">
-      </activityPatternBinding>
- 
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern=".*ImportExecutableWizard">
-      </activityPatternBinding>
-
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*TerminateAndRelaunch">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*terminateAndRemove">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*terminateAll">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*stepWithFilters">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*toggleStepFilters">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.debug.ui.activity"
             pattern="org\.eclipse\.debug.*/.*ToggleStepFilters">
       </activityPatternBinding>
-
+<!-- -->
+<!-- The following UI elements are from org.eclipse.ui.ide -->
       <category
-            name="Nokia Debug"
-            description="Elements associated with the Nokia debugger"
-            id="com.nokia.carbide.cpp.debug.nokiacategory">
+            name="Platform IDE UI"
+            description="Platform IDE UI Elements"
+            id="org.eclipse.ui.ide.category">
       </category>
-
+      <activity
+            name="Platform IDE UI"
+            description="Platform IDE UI Elements"
+            id="org.eclipse.ui.ide.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.ui.ide.activity"
+            categoryId="org.eclipse.ui.ide.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.ui.ide.activity"
             pattern="org.eclipse.ui.project.buildAutomatically">
       </activityPatternBinding>
 
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.ui.ide.activity"
             pattern="org.eclipse.ui.project.buildAll">
       </activityPatternBinding>
-
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.buildConfigToolbarAction">
-      </activityPatternBinding>
-
+<!-- -->
+  
+<!-- The following UI elements are from org.eclipse.cdt.debug.mi.ui -->
+      <category
+            name="CDT - MI Debug UI"
+            description="CDT - MI Debug UI Elements"
+            id="org.eclipse.cdt.debug.mi.ui.category">
+      </category>
+      <activity
+            name="CDT - MI Debug UI"
+            description="CDT - MI Debug Preference Page"
+            id="org.eclipse.cdt.debug.mi.ui.activity">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.mi.ui.activity"
+            categoryId="org.eclipse.cdt.debug.mi.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            pattern="org.eclipse.cdt.managedbuilder.ui/org.eclipse.cdt.ui.buildConfigMenuAction">
-      </activityPatternBinding>
-
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+            activityId="org.eclipse.cdt.debug.mi.ui.activity"
             pattern="org.eclipse.cdt.debug.mi.ui/org.eclipse.cdt.debug.mi.ui.MIPreferencePage">
       </activityPatternBinding>
-
-      <categoryActivityBinding
-            activityId="com.nokia.carbide.cpp.debug.cdtactivity"
-            categoryId="com.nokia.carbide.cpp.debug.nokiacategory">
-      </categoryActivityBinding>
-
+<!-- -->
    </extension>
 
 </plugin>
--- a/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/plugin.xml	Fri May 28 16:01:18 2010 -0500
@@ -44,11 +44,18 @@
             class="com.nokia.carbide.trk.support.connection.TCPIPConnectionType">
       </connectionType>
    </extension>
+   
    <extension
          point="com.nokia.carbide.remoteConnections.connectionType">
       <connectionType
             class="com.nokia.carbide.trk.support.connection.TCFConnectionType">
       </connectionType>
    </extension>
+   <extension
+         point="com.nokia.carbide.remoteConnections.connectionType">
+      <connectionType
+            class="com.nokia.carbide.trk.support.connection.TCFUSBConnectionType">
+      </connectionType>
+   </extension>
  	
 </plugin>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/IUSBConnectionType.java	Fri May 28 16:01:18 2010 -0500
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Nokia and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nokia - Initial API and implementation
+ *******************************************************************************/
+
+package com.nokia.carbide.trk.support.connection;
+
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
+
+/**
+ * Common interface for implementors of IConnectionType for USB.
+ */
+public interface IUSBConnectionType extends IConnectionType {
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFUSBConnection.java	Fri May 28 16:01:18 2010 -0500
@@ -0,0 +1,31 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+package com.nokia.carbide.trk.support.connection;
+
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
+
+import java.util.Map;
+
+public class TCFUSBConnection extends TCPIPConnection {
+
+	public TCFUSBConnection(IConnectionType connectionType, Map<String, String> settings) {
+		super(connectionType, settings);
+	}
+
+	
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/TCFUSBConnectionType.java	Fri May 28 16:01:18 2010 -0500
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+package com.nokia.carbide.trk.support.connection;
+
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
+import com.nokia.carbide.trk.support.Messages;
+
+/**
+ * Implementation of IConnectionType for USB TCF connections.  This also uses Nokia TCF but 
+ * is given a unique identifier for now so we can debug it differently.
+ */
+public class TCFUSBConnectionType implements IUSBConnectionType {
+
+	public static final String ID = "com.nokia.carbide.connection.TCFUSBConnectionType"; //$NON-NLS-1$
+
+	public IConnectionFactory getConnectionFactory() {
+		return new SerialConnectionFactory(this, true);
+	}
+
+	public String getDescription() {
+		return Messages.getString("TCFUSBConnectionType.Desc"); //$NON-NLS-1$
+	}
+
+	public String getDisplayName() {
+		return Messages.getString("TCFUSBConnectionType.Label"); //$NON-NLS-1$
+	}
+
+	public String getHelpContext() {
+		return null;
+	}
+
+	public String getIdentifier() {
+		return ID;
+	}
+
+}
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/USBConnectionType.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/connection/USBConnectionType.java	Fri May 28 16:01:18 2010 -0500
@@ -19,13 +19,12 @@
 package com.nokia.carbide.trk.support.connection;
 
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionType;
 import com.nokia.carbide.trk.support.Messages;
 
 /**
  * Implementation of IConnectionType for USB over TC framework connections
  */
-public class USBConnectionType implements IConnectionType {
+public class USBConnectionType implements IUSBConnectionType {
 
 	public static final String ID = USBConnectionType.class.getName();
 
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Fri May 28 16:01:18 2010 -0500
@@ -56,10 +56,12 @@
 TracingConnectedService.TCPIPInUseStatus=Address {0}, port {1} is in use
 TracingConnectedService.TimedOutError=Attempt to get response from TraceCore timed out
 TracingConnectedService.UnknownLabel=Unknown
-TracingService.AdditionalInfoString=For USB, ensure Trace Switch Application is running on the device 
+TracingService.AdditionalInfoString=For USB, ensure TraceSwitch is running on the device. 
 TracingService.Label=Tracing
 USBConnectionType.Desc=USB serial port connection settings
 USBConnectionType.Label=USB
 TCFConnectionType.Desc=TCP/IP settings
 TCFConnectionType.Label=TCP/IP
+TCFUSBConnectionType.Desc=USB serial port connection settings\n(This is a temporary variant used to target the TCF debug agent on the device.)
+TCFUSBConnectionType.Label=USB (TCF)
 
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/ConnectedServiceFactory.java	Fri May 28 16:01:18 2010 -0500
@@ -31,6 +31,7 @@
 import com.nokia.carbide.trk.support.connection.SerialConnectionType;
 import com.nokia.carbide.trk.support.connection.TCFConnection;
 import com.nokia.carbide.trk.support.connection.TCFConnectionType;
+import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.HostOS;
 
@@ -71,7 +72,8 @@
 
 	private Collection<String> getCompatibleTracingConnectionTypeIds() {
 		return Arrays.asList(new String[] {
-				USBConnectionType.ID
+				USBConnectionType.ID,
+				TCFUSBConnectionType.ID,
 		});
 	}
 	
@@ -80,7 +82,9 @@
 				SerialConnectionType.ID,
 				TCFConnectionType.ID,
 				SerialBTConnectionType.ID,
-				USBConnectionType.ID}); 
+				USBConnectionType.ID,
+				TCFUSBConnectionType.ID,
+				}); 
 	}
 
 	/* (non-Javadoc)
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKConnectedService.java	Fri May 28 16:01:18 2010 -0500
@@ -34,10 +34,10 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
 import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller;
 import com.nokia.carbide.trk.support.Messages;
+import com.nokia.carbide.trk.support.connection.IUSBConnectionType;
 import com.nokia.carbide.trk.support.connection.SerialConnectionType;
 import com.nokia.carbide.trk.support.connection.TCPIPConnectionFactory;
 import com.nokia.carbide.trk.support.connection.TCPIPConnectionType;
-import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.Check;
 import com.nokia.cpp.internal.api.utils.core.Pair;
 import com.nokia.tcf.api.ITCAPIConnection;
@@ -138,7 +138,7 @@
 			}
 			return new Version(versInts[0], versInts[1], versInts[2]);
 		}
-		else if (connection.getConnectionType() instanceof USBConnectionType) {
+		else if (connection.getConnectionType() instanceof IUSBConnectionType) {
 			String portNumStr = connection.getSettings().get(SerialConnectionSettings.PORT);
 			int portNum = Integer.parseInt(portNumStr);
 			return getTRKVersionFromOSTUSB(getSimplePortName(portNum));
@@ -316,7 +316,7 @@
 					estatus = EStatus.IN_USE;
 					IConnectionType connectionType = connection.getConnectionType();
 					if (connectionType instanceof SerialConnectionType ||
-							connectionType instanceof USBConnectionType)
+							connectionType instanceof IUSBConnectionType)
 						message = MessageFormat.format(PORT_IN_USE, 
 								connection.getSettings().get(SerialConnectionSettings.PORT));
 					else if (connectionType instanceof TCPIPConnectionType)
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TRKService.java	Fri May 28 16:01:18 2010 -0500
@@ -45,7 +45,9 @@
 				SerialConnectionType.ID, 
 				SerialBTConnectionType.ID,
 				TCPIPConnectionType.ID,
-				USBConnectionType.ID}); 
+				USBConnectionType.ID,
+				TCFUSBConnectionType.ID
+				}); 
 	}
 
 	public String getDisplayName() {
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Fri May 28 16:01:18 2010 -0500
@@ -32,9 +32,9 @@
 import com.nokia.carbide.remoteconnections.interfaces.IService;
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
 import com.nokia.carbide.trk.support.Messages;
+import com.nokia.carbide.trk.support.connection.IUSBConnectionType;
 import com.nokia.carbide.trk.support.connection.TCPIPConnectionFactory;
 import com.nokia.carbide.trk.support.connection.TCPIPConnectionType;
-import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.Check;
 import com.nokia.tcf.api.ITCAPIConnection;
 import com.nokia.tcf.api.ITCConnection;
@@ -78,7 +78,7 @@
 	}
 
 	private boolean getTraceCoreResponse() throws ConnectionFailException {
-		if (connection.getConnectionType() instanceof USBConnectionType) {
+		if (connection.getConnectionType() instanceof IUSBConnectionType) {
 			String portNumStr = connection.getSettings().get(SerialConnectionSettings.PORT);
 			int portNum = Integer.parseInt(portNumStr);
 			return getTraceCoreResponseFromOSTUSB(getSimplePortName(portNum));
@@ -212,7 +212,7 @@
 				if (connection.isInUse()) {
 					estatus = EStatus.IN_USE;
 					IConnectionType connectionType = connection.getConnectionType();
-					if (connectionType instanceof USBConnectionType)
+					if (connectionType instanceof IUSBConnectionType)
 						message = MessageFormat.format(PORT_IN_USE, 
 								connection.getSettings().get(SerialConnectionSettings.PORT));
 					else if (connectionType instanceof TCPIPConnectionType)
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingService.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingService.java	Fri May 28 16:01:18 2010 -0500
@@ -20,6 +20,7 @@
 
 import com.nokia.carbide.remoteconnections.interfaces.*;
 import com.nokia.carbide.trk.support.Messages;
+import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
 import com.nokia.carbide.trk.support.connection.TCPIPConnectionType;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.cpp.internal.api.utils.core.Check;
@@ -46,7 +47,8 @@
 	public Collection<String> getCompatibleConnectionTypeIds() {
 		return Arrays.asList(new String[] {
 				TCPIPConnectionType.ID,
-				USBConnectionType.ID
+				USBConnectionType.ID,
+				TCFUSBConnectionType.ID,
 		});
 	}
 
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Fri May 28 16:01:18 2010 -0500
@@ -37,6 +37,7 @@
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
 import com.nokia.carbide.trk.support.Messages;
+import com.nokia.carbide.trk.support.connection.TCFUSBConnectionType;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.carbide.trk.support.service.TRKConnectedService;
 import com.nokia.carbide.trk.support.service.TracingConnectedService;
@@ -204,7 +205,8 @@
 	
 	private boolean canBeSetToCurrent(IConnection connection) {
 		// USB connections for now
-		return USBConnectionType.ID.equals(connection.getConnectionType().getIdentifier());
+		return USBConnectionType.ID.equals(connection.getConnectionType().getIdentifier())
+		|| TCFUSBConnectionType.ID.equals(connection.getConnectionType().getIdentifier());
 	}
 
 	private void reconcileStatus(IConnection connection) {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Mon May 24 15:37:56 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Fri May 28 16:01:18 2010 -0500
@@ -18,6 +18,9 @@
 
 import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
 import org.eclipse.cdt.launch.ui.CMainTab;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -33,12 +36,19 @@
 
 public class CarbideMainTab extends CMainTab {
 
+	protected boolean checkProject;
+	
+	
 	public CarbideMainTab() {
 		super();
 	}
 
 	public CarbideMainTab(int flags) {
 		super(flags);
+
+		// CMainTab won't validate a project if we tell it to ignore the program, so
+		// add the project validation here
+		checkProject = (flags & DONT_CHECK_PROGRAM) != 0;
 	}
 	
 	protected void createExeFileGroup(Composite parent, int colSpan) {
@@ -95,6 +105,28 @@
 		fDisableBuildButton.setData(".uid", "CMainTab.DisableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
 		fWorkspaceSettingsButton.setData(".uid", "CMainTab.WorkspaceSettingsButton"); //$NON-NLS-1$ //$NON-NLS-2$ 
 		fWorkpsaceSettingsLink.setData(".uid", "CMainTab.WorkspaceSettingsLink"); //$NON-NLS-1$ //$NON-NLS-2$
-		
 	}
-}
\ No newline at end of file
+
+	@Override
+	public boolean isValid(ILaunchConfiguration config) {
+		boolean valid = super.isValid(config);
+		if (valid && checkProject) {
+			String name = fProjText.getText().trim();
+			if (name.length() == 0) {
+				setErrorMessage(LaunchMessages.getString("CMainTab.Project_not_specified")); //$NON-NLS-1$
+				return false;
+			}
+			if (!ResourcesPlugin.getWorkspace().getRoot().getProject(name).exists()) {
+				setErrorMessage(LaunchMessages.getString("Launch.common.Project_does_not_exist")); //$NON-NLS-1$
+				return false;
+			}
+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+			if (!project.isOpen()) {
+				setErrorMessage(LaunchMessages.getString("CMainTab.Project_must_be_opened")); //$NON-NLS-1$
+				return false;
+			}
+		}
+
+		return valid;
+	}
+}
--- a/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml	Mon May 24 15:37:56 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml	Fri May 28 16:01:18 2010 -0500
@@ -55,30 +55,6 @@
    </extension>
 
    <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            description="%activityDescription"
-            id="com.nokia.carbide.cpp.qt.qtprojectcreationactivity"
-            name="%activityName"/>
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.qt.qtprojectcreationactivity"
-            pattern="com.trolltech.qtcppproject/com.trolltech.qtcppproject.wizards.QtConsoleProjectWizard"/>
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.qt.qtprojectcreationactivity"
-            pattern="com.trolltech.qtcppproject/com.trolltech.qtcppproject.wizards.QtGuiProjectWizard"/>
-      <activityPatternBinding
-            activityId="com.nokia.carbide.cpp.qt.qtprojectcreationactivity"
-            pattern="com.trolltech.qtcppproject/com.trolltech.qtcppproject.wizards.ImportQtWizard"/>
-      <category
-            description="%categoryDescription"
-            id="com.nokia.carbide.cpp.qt.qtuicategory"
-            name="%categoryName"/>
-      <categoryActivityBinding
-            activityId="com.nokia.carbide.cpp.qt.qtprojectcreationactivity"
-            categoryId="com.nokia.carbide.cpp.qt.qtuicategory"/>
-   </extension>   
-   
-   <extension
          point="com.trolltech.qtcppproject.qmakeEnvironmentModifier">
       <modifier
             class="com.nokia.carbide.cpp.internal.qt.ui.QMakeEnvironmentModifier">