# HG changeset patch
# User dadubrow
# Date 1279568487 18000
# Node ID 02511d2a1482022787eda1aeeefcb065fbcc158a
# Parent 06fc2fdd1ac44b90b145da62edd330b154ebd6d9# Parent f69b88cecb3c9213f600825a83793c5bdc4ce63e
merge
diff -r 06fc2fdd1ac4 -r 02511d2a1482 core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm
--- 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 @@
Variables View
-The Variables 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.
+The Variables 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: QString, QByteArray, QSet, QHash, QMap, QVector, QList, QLinkedList and Qvariant.
Figure 1 shows the Variables view with Show Type Names option enabled.
Figure 1 - Variables view showing type names
diff -r 06fc2fdd1ac4 -r 02511d2a1482 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- 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!
What's New in 3.0.0
The following features for Symbian development are provided within Carbide.c++:
+Milestone 2
+
+ - A new Carbide Portal view provides easier access to Carbide information, an extensions marketplace, and support.
+ - The Variables view and debug hover now supports the following Qt data types: QString, QByteArray, QSet, QHash, QMap, QVector, QList, QLinkedList and Qvariant.
+
+Milestone 1
- Eclipse 3.6 — The Eclipse 3.6 project (Helios) provides the foundation, or integration platform, on which Carbide.c++ is built. See What's New in 3.6 for more information.
- CDT 7.0 — The final version of CDT is included as part of the Helios release. See the CDT 7.0 News and Noteworthy page for more information.
diff -r 06fc2fdd1ac4 -r 02511d2a1482 core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- 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 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+