Mercurial Mercurial > oss > FCL > sftools > dev > ide > carbidecpp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge RCL_2_4
authorcawthron
Tue, 02 Mar 2010 13:27:01 -0600
branchRCL_2_4
changeset 1059 7cfa83353a87
parent 1058 49b17289f4ed (diff)
parent 1056 2b0ea08bb22f (current diff)
child 1060 852f9f9927e6
merge
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Tue Mar 02 09:48:37 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Tue Mar 02 13:27:01 2010 -0600
@@ -44,8 +44,7 @@
         <li>TRK ...</li>
     </ul>
   </li>
-  <li><b>RVCT 4.0 (ARMv5)</b> supported</li>
-  <li><b>SmartInstaller for Qt</b> supported</li>
+  <li><b>RVCT 4.0 (ARMv5)</b> builds and some limited debugging is supported</li>
 </ul>
 <h4><a name="new240" id="new240"></a>2.4.0</h4>
 <ul>
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Tue Mar 02 09:48:37 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Tue Mar 02 13:27:01 2010 -0600
@@ -13,8 +13,7 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true"
-				persist="true">
+				mandatory="true">
 				<description>%uid3.desc</description>
 		</uidField>
 	</wizardPage>
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Tue Mar 02 09:48:37 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Tue Mar 02 13:27:01 2010 -0600
@@ -20,8 +20,7 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true"
-				persist="true">
+				mandatory="true">
 				<description>%uid3.desc</description>
 		</uidField>
 	</wizardPage>
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Tue Mar 02 09:48:37 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Tue Mar 02 13:27:01 2010 -0600
@@ -20,8 +20,7 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true"
-				persist="true">
+				mandatory="true">
 				<description>%uid3.desc</description>
 		</uidField>
 	</wizardPage>
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Tue Mar 02 09:48:37 2010 -0600
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Tue Mar 02 13:27:01 2010 -0600
@@ -20,8 +20,7 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true"
-				persist="true">
+				mandatory="true">
 				<description>%uid3.desc</description>
 		</uidField>
 	</wizardPage>
FCL/sftools/dev/ide/carbidecpp