merge
authordadubrow
Mon, 19 Jul 2010 14:41:27 -0500
changeset 1638 02511d2a1482
parent 1637 06fc2fdd1ac4 (current diff)
parent 1636 f69b88cecb3c (diff)
child 1639 5fdc216afa33
merge
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Mon Jul 19 14:40:41 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Mon Jul 19 14:41:27 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Variables View </h2>
-<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. </p>
+<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. In addition to the standard C/C++, Symbian, and the Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</p>
 <p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
 <p align="center"><img src="../images/views/view_variables.png" width="544" height="221" /></p>
 <p class="figure">Figure 1 - Variables view showing type names </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jul 19 14:40:41 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jul 19 14:41:27 2010 -0500
@@ -31,6 +31,12 @@
 changes making the tools unusable!</p>
 <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>
+<h4>Milestone 2</h4>
+<ul>
+    <li>A new <a href="reference/view_carbide_portal.htm">Carbide Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
+    <li>The <a href="reference/view_variables.htm">Variables</a> view and debug hover now supports the following Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</li>
+</ul>
+<h4>Milestone 1</h4>
 <ul>
     <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>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jul 19 14:40:41 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jul 19 14:41:27 2010 -0500
@@ -20,23 +20,22 @@
     <topic label="Concepts" 					href="html/concepts/concepts.htm" />
   </topic>
    <topic label="Carbide tutorials">
-		<topic label="Creating and Debugging Projects Tutorial"		href="html/projects/tutorials/new_proj_from_template_00.htm" >
+		<topic label="Emulator Application Projects"				href="html/projects/tutorials/new_proj_from_template_00.htm" >
 		  <topic label="Creating new projects from templates" 		href="html/projects/tutorials/new_proj_from_template_01.htm" />
 		  <topic label="Building projects and components" 			href="html/projects/tutorials/new_proj_from_template_02.htm" />
 		  <topic label="Defining a launch configuration"			href="html/projects/tutorials/new_proj_from_template_03.htm" />
 		  <topic label="Launching and debugging an executable" 		href="html/projects/tutorials/new_proj_from_template_04.htm" />
 		</topic>
-		<topic label="Creating and Debugging DLL Projects"			href="html/projects/tutorials/new_proj_dll_example_00.htm" >
+		<topic label="DLL Projects"									href="html/projects/tutorials/new_proj_dll_example_00.htm" >
 		  <topic label="Creating DLL Projects" 						href="html/projects/tutorials/new_proj_dll_example_01.htm" />
 		  <topic label="Building the DLL Project" 					href="html/projects/tutorials/new_proj_dll_example_02.htm" />
 		  <topic label="Debugging a DLL Project"					href="html/projects/tutorials/new_proj_dll_example_03.htm" />
 		</topic>
-		<topic label="Debugging on Remote Targets (Run-mode)"		href="html/projects/tutorials/run_mode_debug_example_00.htm" >
-		  <topic label="Verifying system setup" 					href="html/projects/tutorials/run_mode_debug_example_01.htm" />
-		  <topic label="Install remote debug agent" 				href="html/projects/tutorials/run_mode_debug_example_02.htm" />
-		  <topic label="Connect remote device to PC"				href="html/projects/tutorials/run_mode_debug_example_03.htm" />
-		  <topic label="Create or import project"					href="html/projects/tutorials/run_mode_debug_example_04.htm" />
-		  <topic label="Debug on remote device"						href="html/projects/tutorials/run_mode_debug_example_05.htm" />
+		<topic label="Remote Target Debugging (Run-mode)"			href="html/projects/tutorials/run_mode_debug_example_00.htm" >
+		  <topic label="Install remote debug agent" 				href="html/projects/tutorials/run_mode_debug_example_01.htm" />
+		  <topic label="Connect remote device to PC"				href="html/projects/tutorials/run_mode_debug_example_02.htm" />
+		  <topic label="Create or import project"					href="html/projects/tutorials/run_mode_debug_example_03.htm" />
+		  <topic label="Debug on remote device"						href="html/projects/tutorials/run_mode_debug_example_04.htm" />
 		</topic>
    </topic>
   <topic label="Carbide menus" 					href="html/reference/menus/menus.htm" >