README

-Qt Creator 1.3.82
+Qt Creator 1.3.83
 ===============
 Qt Creator is a crossplatform C++ IDE for development with the Qt framework.
 

dist/changes-2.0.0

@@ -36,7 +36,7 @@ Editing
      the syntax highlighting.
 
 CodePaster
-   * Implemented new protocol of pastebin.com including list functionality\
+   * Implemented new protocol of pastebin.com including list functionality
 
 C++ Support
    * Recognize *.cu as C files

doc/qtcreator.qdoc

@@ -12,7 +12,7 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 1.3.82
+    \section1 Version 1.3.83 (2.0.0 Beta)
 
     Qt Creator provides integrated tools for both application designers
     and developers to create applications for multiple desktop and mobile device
@@ -251,7 +251,7 @@
             \o Mac OS X
             \o Yes
             \o No
-            \o No
+            \o Yes
     \endtable
 */
 
@@ -3340,7 +3340,7 @@
     specified in the \c CMake project file.
 
     Known issues for the current version can be found
-    \l{Known Issues of version 1.3.82}{here}.
+    \l{Known Issues of version 1.3.83}{here}.
 
 
     \section1 Adding External Libraries to a CMake Project
@@ -3703,7 +3703,7 @@
 
            For more information about MADDE pertaining to its
            installation, configuration, and deployment on the device, see
-          \l{http://wiki.maemo.org/MADDE}{Introdution to MADDE}.
+          \l{http://wiki.maemo.org/MADDE}{Introduction to MADDE}.
 
        \o  An IP address for the device.
 
@@ -3718,18 +3718,14 @@
     following:
     \list
        \o The Nokia USB drivers that come, for example with, PC Suite.
-       \o Qt installed on the device. A simple technique to
-          install Qt is to run the Maemo device \gui{Application Manager} and
-          download any application using Qt Creator. Running the Maemo device
-          \gui{Application Manager} and downloading an application with Qt
-          Creator installs all dependencies required for Qt Creator at the same
-          time.
+       \o Qt installed on the device. Recent images should have Qt pre-installed.
     \endlist
 
      The Qt Creator/MADDE integration is supported on the following platforms:
     \list
        \o  Linux (32 bit and 64 bit)
        \o  Windows (32 bit and 64 bit)
+       \o  MacOS 10.5 ("Leopard") or higher
     \endlist
 
     \section1 Setting Up the N900
@@ -3742,8 +3738,7 @@
     diagnostics functions but is essential for creating connections between the
     device and your workstation.
 
-    For the workstation, you need to set up a network port that detects the
-    Maemo device as a network device
+    For the workstation, you need to set up the N900 as a network device.
 
     \note If you use the device's USB network functionality and plan to
     connect your development PC to the N900 via a common WLAN network, you can
@@ -3754,7 +3749,7 @@
     To install Mad Developer on your device, you need to add an application
     catalogue (repository) to the list of catalogues your device checks for
     installable software, and install the actual Mad Developer software
-    package using root privileges. This is done according to the following
+    package. This is done according to the following
     steps:
      \list 1
          \o Start the application manager
@@ -3854,11 +3849,11 @@
     \l{http://wiki.maemo.org/MADDE}{here}, execute it and follow the
     instructions. The package will be installed. Then run:
     \c{mad-admin list targets} to see which targets are available.
-    Install the targets that starts with "fremantle" by using the command:
+    Install the target that starts with "fremantle" by using the command:
     \c{mad-admin create fremantle-qt-xxx}
 
     When you have installed the target, you have a toolchain and a sysroot
-    environment for cross-compiling
+    environment for cross-compiling.
 
     \section1 Setting Up Qt Creator
 
@@ -3948,6 +3943,9 @@
     \list
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}
            {S60 Platform SDK 3rd Edition FP1 or higher}.
+        \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}
+           {Open C/C++ v1.6.0 or higher}
+           (install this into all S60 SDKs you plan to use Qt with).
         \o Either the GCCE ARM Toolchain that is included in the S60 Platform
            SDKs, or RVCT 2.2 [build 686] or later (which is not available free
            of charge)(Your environment needs to find the compiler in the PATH).
@@ -4996,9 +4994,13 @@
     There are some known issues with Qt Creator.
     The development team is aware of them, there is no need to report them as bugs.
 
-    \section1 Known Issues of Version 1.3.82
+    \section1 Known Issues of Version 1.3.83
 
     \list
+        \o On Windows, debugging a MinGW-built console application (with \gui{Run in terminal}
+           checked) using gdb does not work due to a bug in gdb related to attaching to
+           stopped processes (see \l{http://bugreports.qt.nokia.com/browse/QTCREATORBUG-1020}).
+
         \o Debugging Helper does not work while performing On-Device Debugging.
 
         \o QML Preview (Run Project) only works if built against Qt with

doc/qtcreator.qdocconf

@@ -19,16 +19,16 @@ sources.fileextensions  = "qtcreator.qdoc addressbook-sdk.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.1382
+qhp.QtCreator.namespace        = com.nokia.qtcreator.1383
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = classic.css \
                           images/qt-logo.png \
                           images/qtcreator-screenshots.png
-qhp.QtCreator.filterAttributes = qtcreator 1.3.82
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.82
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.82
+qhp.QtCreator.filterAttributes = qtcreator 1.3.83
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.83
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.83
 
 # macros.qdocconf
 
@@ -213,5 +213,5 @@ HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
                           "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.3.82</div></td>\n" \
+                          "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Creator 1.3.83</div></td>\n" \
                           "</tr></table></div></address>"

share/qtcreator/patches/README

+
+For Linux, MinGW:
+
+    FSF 7.1 release
+    + gdb-increased-dcache-line-size.patch
+
+For Maemo targets:
+    (--target=arm-none-linux-gnueabi)
+
+    FSF 7.1 release
+    + gdb-increased-dcache-line-size.patch
+    + gdb-stepping-for-maemo.patch
+
+For Symbian targets:
+    (--target=arm-none-symbianelf)
+
+    CS 4.4-164 release
+    + gdb-increased-dcache-line-size.patch
+    + gdb-work-around-trk-single-step.patch
+
+
+
+Experimental for performance (don't apply):
+
+    gdb-without-dwarf-name-canonicalization.patch
+
+

share/qtcreator/patches/gdb-stepping-for-maemo.patch

+--- a/gdb/infrun.c
++++ b/gdb/infrun.c
+@@ -4126,7 +4127,9 @@ infrun: not switching back to stepped thread, it has vanished\n");
+ 
+   if (execution_direction != EXEC_REVERSE
+       && ecs->event_thread->step_over_calls == STEP_OVER_UNDEBUGGABLE
+-      && in_solib_dynsym_resolve_code (stop_pc))
++      && in_solib_dynsym_resolve_code (stop_pc)
++      && !(ecs->event_thread->step_range_start > 1
++        && in_solib_dynsym_resolve_code (ecs->event_thread->step_range_start)))
+     {
+       CORE_ADDR pc_after_resolver =
+    gdbarch_skip_solib_resolver (gdbarch, stop_pc);
+
+------------------------------------------------------------------------
+
+NOTE: This relates to http://sourceware.org/bugzilla/show_bug.cgi?id=11497

share/qtcreator/qmldesigner/Button.qml

 import Qt 4.6
 
 Rectangle {
-    property var label: "Button"
+    property variant label: "Button"
     signal clicked
 
     width: 75

share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml

@@ -5,9 +5,9 @@ QWidget { //This is a special checkBox that does color coding for states
 
     id: checkBox;
 
-    property var backendValue;
+    property variant backendValue;
 
-    property var baseStateFlag;
+    property variant baseStateFlag;
     property alias checkable: localCheckBox.checkable
     property alias text: localLabel.text
 

share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml

@@ -4,14 +4,14 @@ import Bauhaus 1.0
 QExtGroupBox {
     id: colorGroupBox
 
-    property var finished;
-    property var backendColor
-    property var color: (backendColor === undefined || backendColor.value  === undefined) ? "#000000" : backendColor.value
-    property var oldMaximumHeight;
-
-    property var startupCollapse: selectionChanged === undefined ? false : selectionChanged;
-    property var firstTime: true;
-	property var caption: ""
+    property variant finished;
+    property variant backendColor
+    property variant color: (backendColor === undefined || backendColor.value  === undefined) ? "#000000" : backendColor.value
+    property variant oldMaximumHeight;
+
+    property variant startupCollapse: selectionChanged === undefined ? false : selectionChanged;
+    property variant firstTime: true;
+	property variant caption: ""
 	smooth: false
 
     onFinishedChanged: {
@@ -32,14 +32,14 @@ QExtGroupBox {
     }
 
 
-    property var baseStateFlag: isBaseState
+    property variant baseStateFlag: isBaseState
     onBaseStateFlagChanged: {
         evaluate();
     }
     onBackendColorChanged: {
         evaluate();
     }
-    property var isEnabled: colorGroupBox.enabled
+    property variant isEnabled: colorGroupBox.enabled
     onIsEnabledChanged: {
         evaluate();
     }
@@ -143,7 +143,7 @@ QExtGroupBox {
 
                 ColorBox {
                     id: colorControl;
-                    property var backendColor: colorGroupBox.color;
+                    property variant backendColor: colorGroupBox.color;
                     color: colorGroupBox.color;
                     onColorChanged: if (colorGroupBox.color != color) {
                         colorGroupBox.backendColor.value = color;

share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml

@@ -3,10 +3,10 @@ import Bauhaus 1.0
 
 Item {
     id: colorScheme
-    property var disabledColor: "gray";
-    property var defaultColor: "white";
-    property var boldTextColor: "#dedede";
-    property var changedBaseColor: "#9999ff";
-    property var changedStateColor: "#99ccff";
-    property var optionsColor: "white";
+    property variant disabledColor: "gray";
+    property variant defaultColor: "white";
+    property variant boldTextColor: "#dedede";
+    property variant changedBaseColor: "#9999ff";
+    property variant changedStateColor: "#99ccff";
+    property variant optionsColor: "white";
 }

share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml

@@ -5,8 +5,8 @@ QWidget {
 
     id: comboBox
 
-    property var backendValue;
-    property var baseStateFlag;
+    property variant backendValue;
+    property variant baseStateFlag;
     property alias enabled: box.enabled;
 
     property alias items: box.items;
@@ -17,7 +17,7 @@ QWidget {
         evaluate();
     }
 
-    property var isEnabled: comboBox.enabled
+    property variant isEnabled: comboBox.enabled
     onIsEnabledChanged: {
         evaluate();
     }
@@ -47,7 +47,7 @@ QWidget {
     layout: HorizontalLayout {
         QComboBox {
             id: box
-            property var backendValue: comboBox.backendValue
+            property variant backendValue: comboBox.backendValue
             onCurrentTextChanged: { backendValue.value = currentText; evaluate(); }
             ExtendedFunctionButton {
                 backendValue: comboBox.backendValue;

share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml

@@ -5,8 +5,8 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
 
     id: doubleSpinBox;
 
-    property var backendValue;
-    property var baseStateFlag;
+    property variant backendValue;
+    property variant baseStateFlag;
     property alias singleStep: box.singleStep
     property alias minimum: box.minimum
     property alias maximum: box.maximum

share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml

@@ -8,7 +8,7 @@ QWidget {
     width: frame.width - 22
     height: 40
     property bool active: false
-    property var backendValue;
+    property variant backendValue;
 
 
     onActiveChanged: {

share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml

@@ -8,8 +8,8 @@ GroupBox {
 
     layout: VerticalLayout{
 
-        property var effect: backendValues.effect
-        property var complexNode: effect.complexNode
+        property variant effect: backendValues.effect
+        property variant complexNode: effect.complexNode
 
         QWidget  {
             maximumHeight: 40;
@@ -19,8 +19,8 @@ GroupBox {
                 }
                 QComboBox {
                     enabled: isBaseState;
-                    property var type: backendValues.effect.complexNode.type
-                    property var dirty;
+                    property variant type: backendValues.effect.complexNode.type
+                    property variant dirty;
                     id: effectComboBox;
                     items : { [
                             "None",
@@ -60,7 +60,7 @@ GroupBox {
             }
             }// QWidget
 
-            property var properties: complexNode == null ? null : complexNode.properties
+            property variant properties: complexNode == null ? null : complexNode.properties
 
             QWidget {
                 minimumHeight: 20;
@@ -101,7 +101,7 @@ GroupBox {
                         visible: effectComboBox.currentText == "Colorize";
                         layout: QVBoxLayout {
 
-                            property var colorProp: properties == null ? null : properties.color
+                            property variant colorProp: properties == null ? null : properties.color
 
 
                             ColorLabel {

share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml

@@ -4,7 +4,7 @@ import Bauhaus 1.0
 QToolButton {
     id: extendedFunctionButton
 
-    property var backendValue
+    property variant backendValue
 
     function setIcon() {
         if (backendValue == null)

share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml

@@ -6,9 +6,9 @@ QFrame {
     focusPolicy: "Qt::NoFocus"
     id: extendedSwitches;
     property bool active: false;
-    property var backendValue;
+    property variant backendValue;
     styleSheetFile: "switch.css";
-    property var specialModeIcon;
+    property variant specialModeIcon;
     specialModeIcon: "images/standard.png";
 
     opacity: 0;

share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml

@@ -5,8 +5,8 @@ QWidget {
     id: fontComboBox
 
     property alias currentFont: fontSelector.currentFont
-    property var backendValue
-    property var baseStateFlag;
+    property variant backendValue
+    property variant baseStateFlag;
     property alias enabled: fontSelector.enabled
 
     onBaseStateFlagChanged: {
@@ -17,7 +17,7 @@ QWidget {
         evaluate();
     }
 
-    property var isEnabled: fontComboBox.enabled
+    property variant isEnabled: fontComboBox.enabled
     onIsEnabledChanged: {
         evaluate();
     }
@@ -59,7 +59,7 @@ QWidget {
             id: fontSelector            
 			
 			currentFont.family: backendValue.value
-			property var fontFamily: currentFont.family
+			property variant fontFamily: currentFont.family
             onFontFamilyChanged: {
 			    if (backendValue === undefined)
 			        return;