# HG changeset patch
# User cawthron
# Date 1267558021 21600
# Node ID 7cfa83353a873eb7e13c972a5026f7035a095808
# Parent  49b17289f4ed438cf2818d423a3c12c85f178fe0# Parent  2b0ea08bb22f2d7aa664aa13517330898b794fcf
merge

diff -r 2b0ea08bb22f -r 7cfa83353a87 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- 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>
diff -r 2b0ea08bb22f -r 7cfa83353a87 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml
--- 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>
diff -r 2b0ea08bb22f -r 7cfa83353a87 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml
--- 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>
diff -r 2b0ea08bb22f -r 7cfa83353a87 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml
--- 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>
diff -r 2b0ea08bb22f -r 7cfa83353a87 templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml
--- 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>