daily merge RCL_2_4
authorfturovic <frank.turovich@nokia.com>
Mon, 25 Jan 2010 10:09:42 -0600
branchRCL_2_4
changeset 811 cc0961d7c88d
parent 810 125f1619c573 (diff)
parent 808 3a264b9d91ef (current diff)
child 812 28ecd12b642d
child 817 41b05da1d19f
daily merge
--- a/core/carbide_releases/readme/readme_sdks.html	Mon Jan 25 08:53:08 2010 -0600
+++ b/core/carbide_releases/readme/readme_sdks.html	Mon Jan 25 10:09:42 2010 -0600
@@ -6,17 +6,22 @@
 <title>SDK Support in Carbide.c++</title>
 <style type="text/css">
 <!--
-.style6 {font-weight: bold}
+body { background-image: url(background_carbide.jpg);}
+.style1 {font-size: x-small}
+.style2 {font-family: "Courier New", Courier, mono}
+.style3 {color: #FF0000; font-weight: bold}
+.style4 {font-weight: bold}
+.style5 {color: #FFFFFF; }
 -->
 </style>
 </head>
 
-<body background="background_carbide.jpg">
+<body >
 
 <h2>You're not done installing just yet... </h2>
-<p>Release: 2.1.0<br>
-  Revised:&nbsp;June 2009</p>
-<p>Read the <b>Release Notes</b> and <b>Bug Fixes</b> for the latest infomation about this product. In Carbide.c++ simply click the <b>Help &gt; Help Contents &gt; Carbide.c++ User Guide</b> to find the pages.</p>
+<p>Release: 2.5<br>
+  Revised:&nbsp;Jan 2010</p>
+<p>Read the <b>Release Notes</b> and <b>What's New</b> for the latest infomation about this product. In Carbide.c++ simply click  <b>Help &gt; Help Contents &gt; Carbide Help</b>.</p>
 <p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span>  install the following: </p>
 <table width="80%"  border="0">
   <tr>
@@ -39,27 +44,27 @@
     <td bgcolor="#ffffff">
 		<p>Also, you must  install at least one of the following  SDKs to develop Symbian applications:
 </p>
-		<p><b>NOTE</b> Carbide.c++ requires SDKs built to support  <span class="style2">WINSCW</span> format. </p>
-		<p><strong>S60 Platform SDKs</strong> (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>) </p>
+		<p><b>NOTE</b> Carbide.c++ requires SDKs built to support <span class="style2">WINSCW</span> format. </p>
+		<p><strong>Symbian Foundation</strong></p>
+	      <ul>
+            <li>Application Development Toolkit (ADT) 
+              (<a href="http://developer.symbian.org/main/tools_and_kits/downloads/view.php?id=2">download)</a>
+                    </ul>
+	      <p><strong>S60 Platform SDKs</strong></p>
 	      <ul>
-	        <li>S60 5th Edition
-	        <li>S60 3rd Edition, FP2 
-	        <li>S60 3rd Edition, FP1
-	        <li>S60 3rd Edition, MR 
-            </ul>
-	<p><strong>Qt SDKs</strong> (<a href="http://www.trolltech.com/">www.trolltech.com</a>) </p>
+	        <li>S60 5th and 3rd Editions, N97
+	        (<a href="http://www.forum.nokia.com/info/sw.nokia.com/id/ec866fab-4b76-49f6-b5a5-af0631419e9c/S60_All_in_One_SDKs.html">All-in-one SDKs)</a>
+	        <li>S60 3rd Edition, FP1and earlier (<a href="http://www.forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">S60 Platform SDKs</a>)
+	      </ul>
+	<p><strong>Qt SDKs</strong></p>
       <ul>
-        <li>Qt SDK for S60        
+        <li>Qt for Open Source C++
+      (<a href="http://qt.nokia.com/downloads/symbian-cpp">download</a>)
       </ul>
-      <p><strong>UIQ SDKs</strong> (<a href="http://developer.uiq.com/">developer.uiq.com</a>) </p>
-      <ul>
-        <li>UIQ 3.1        
-        <li>UIQ 3.0        
-      </ul></td>
+    </td>
   </tr>
 </table>
-<p>&nbsp;</p>
-<div id="footer"><span class="style6">Copyright &copy; 2009 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></span></div>
+<hr size="1" noshade>
+<p class="footer style1" >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>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Jan 25 08:53:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Jan 25 10:09:42 2010 -0600
@@ -19,7 +19,7 @@
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
 <p>The behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../debugger/debug/cmds_starting.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
 <p align="center"><img src="images/page_debug_main.png" width="562" height="249"></p>
-<p class="figure">Figure 1. Main page (Emulation shown) </p>
+<p class="figure">Figure 1. Main page (<i>Emulation shown</i>) </p>
 <h5>Table 1. Emulator Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -53,7 +53,7 @@
 <h3><a name="run_mode" id="run_mode"></a>Run-mode Main page </h3>
 <p>The <b>Symbian OS <a href="run_mode.htm">Application TRK </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
 <p align="center"><img src="images/page_main_run_mode.png" width="545" height="345"></p>
-<p class="figure">Figure 2 - Main page (Application TRK shown) </p>
+<p class="figure">Figure 2 - Main page (<i>Application TRK shown</i>) </p>
 <h5>Table 2.  Run-mode Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -90,7 +90,7 @@
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
 <p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a>, <a href="sophia.htm">Sophia</a></b>, and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
 <p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
-<p class="figure">Figure 3. Main page (TRACE32 shown)</p>
+<p class="figure">Figure 3. Main page (<i>TRACE32 shown</i>)</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Mon Jan 25 08:53:08 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Mon Jan 25 10:09:42 2010 -0600
@@ -9,7 +9,7 @@
 	 <p>Carbide supports the use of code styles in projects via the C/C++  <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several preset code styles like GNU, while Carbide supplies these  profiles:</p>
 	 <ul>
 	   <li><b>Symbian OS</b> &#8212; settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a> PDF </li>
-	   <li><b>S60</b> &#8212; settings are based on the <a href="http://www.forum.nokia.com/document/Cpp_Developers_Library/?content=GUID-232258EC-D3B4-4D72-B12B-FFC34F070B4B_GUID-0B6641F4-8393-40B0-96A1-8BF96CB41134.html">S60 Platform: C++ Coding Conventions</a> PDF </li>
+	   <li><b>S60</b> &#8212; settings are based on the <a href="http://www.forum.nokia.com/document/Cpp_Developers_Library/?content=GUID-232258EC-D3B4-4D72-B12B-FFC34F070B4B_GUID-0B6641F4-8393-40B0-96A1-8BF96CB41134.html">S60 Platform: C++ Coding Conventions</a></li>
    </ul>
 	 <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
 	 <p align="center"><img src="images/wnd_pref_code_styles.png" width="627" height="544" /></p>