# HG changeset patch
# User timkelly
# Date 1271790608 18000
# Node ID 174c8b7f4dff5e528677dfd34928f3d85b17ee7a
# Parent  9cfb1ca53be5b49b71638972c2a72515634abd8e# Parent  897fa364d410c6298ebb5f70b6b9aad870808cbd
merge commit

diff -r 9cfb1ca53be5 -r 174c8b7f4dff core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Apr 20 14:09:27 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Apr 20 14:10:08 2010 -0500
@@ -25,11 +25,18 @@
   <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>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10674">10674</a> - Resolved an issue where SBSv2 variant names where not parsed and located correctly. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10681">10681</a> - Carbide is now more robust in automatically detecting Qt installations. </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 now displays appropriate errors if the SBS_HOME environment variable is missing.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10743">10743</a> - Corrected an issue that prevented compiling of files with different case handling of file names across different OS systems. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10759">10759</a> - Corrected an issue where a remote connection was not removed from the Remote Connections view when the device was no longer connected. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10795">10795</a> - Carbide detection of Symbian^3 SDKs is now more robust. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10805">10805</a> - Improved device connection behavior when devices are plugged and unplugged or when devices are swapped making notification message more reliable. </li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10861">10861</a> - Launch wizard can no longer automatically select DLLs as the executable.</li>
+  <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>
diff -r 9cfb1ca53be5 -r 174c8b7f4dff core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Tue Apr 20 14:09:27 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Tue Apr 20 14:10:08 2010 -0500
@@ -27,14 +27,20 @@
 	<context id="project_properties_page" >
 		<description>Use the Carbide Project Settings window to specify project build options.</description>
 		<topic label="Carbide Project Settings"		              href="html/reference/build_properties/pane_project_settings.htm" />
+		<topic label="Carbide Build Configurations"				  href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="Macro Settings"				  			  href="html/reference/build_properties/pane_macro_settings.htm" />
 		<topic label="Building Projects"			              href="html/tasks/projects/prj_build.htm" />
-		<topic label="Carbide Build Configurations"				  href="html/reference/build_properties/pane_build_config.htm" />
 	</context>
 
 	<!-- Carbide Build Configurations Page -->
 	<context id="project_configurations_page" >
 		<description>The Carbide Build Configurations page allows you to specify SIS file options and environment variable settings for the selected build configuration</description>
 		<topic label="Carbide Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="SIS Builder"									href="html/reference/build_properties/pane_build_config_sis.htm" />
+		<topic label="SBSv2"										href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
+		<topic label="Environment"									href="html/reference/build_properties/pane_build_config_env.htm" />
+		<topic label="Paths and Symbols"							href="html/reference/build_properties/pane_build_config_paths.htm" />
+		<topic label="ROM Builder"									href="html/reference/ROM_build_settings.html" />
 		<topic label="Carbide Build Configurations Manage SDK"		href="html/reference/ProjectTypeandSDK.html" />
 		<topic label="Environment Variables"						href="html/reference/build_properties/pane_build_config_env.htm" />
 	</context>
@@ -130,11 +136,13 @@
 	</context>
 
 	<!-- Carbide Project Settings Page -->
+	<!-- DUPLICATE DEFINITION
 	<context id="project_properties_page" >
 		<description>Project Properties page</description>
 		<topic label="Project Properties page"  	href="html/tasks/ImportingProjects.html" />
 		<topic label="Importing Projects"  			href="html/tasks/ImportingProjects.html" />
 	</context>
+	-->
 
 	<!-- Choose Project Page   -->
 	<context id="choose_project_page" >
diff -r 9cfb1ca53be5 -r 174c8b7f4dff core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Tue Apr 20 14:09:27 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Tue Apr 20 14:10:08 2010 -0500
@@ -310,6 +310,16 @@
 		<topic label="Console view"  			href="html/reference/view_log.htm" />
 	</context>
 
+
+	<!-- ============================================================== -->
+	<!-- PROJECT PROPERTY DIALOG                                        -->
+	<context id="property_dialog_context" >
+		<description>Carbide specific project settings.</description>
+		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="Macro Settings"					href="html/reference/build_properties/pane_macro_settings.htm" />
+		<topic label="Project Settings"					href="html/reference/build_properties/pane_project_settings.htm" />
+	</context>
+	
 	
 	<!-- PREFERENCE PANELS -->