README

-Qt Creator 1.3.84
+Qt Creator 2.0.0
 ===============
 Qt Creator is a crossplatform C++ IDE for development with the Qt framework.
 
@@ -26,6 +26,12 @@ cd $BUILD_DIRECTORY
 qmake $SOURCE_DIRECTORY/qtcreator.pro
 make (or mingw32-make or nmake or jom, depending on your platform)
 
+Qml Support
+-----------
+
+Define the QTCREATOR_WITH_QML environment variable to enable Qml support
+(before running qmake).
+
 QmlDesigner, QmlInspector require private headers
 -------------------------------------------------
 

dist/changes-2.0.0

@@ -17,7 +17,7 @@ General
      of Qt creator
    * Added option to set interface language explicitly, overriding the locale
      setting
-   * New "Design" mode for visual editors (.ui & .qml files)
+   * New "Design" mode for visual editors
    * Fixed crash when working with empty pro-file
    * Ask for close, save, or save as when file is removed while open in Qt Creator
    * Use shadowbuilding by default in new projects whenever possible
@@ -36,6 +36,11 @@ Editing
      the syntax highlighting.
    * Block selection defines a find & replace scope
    * Added customizable default file encoding (in addition to the project setting)
+   * Added syntax highlighting for CMake project files
+   * Fixed .pro files being reformatted if files have been added or removed.
+     In addition, whitespace is preserved
+   * Fixed the file system sidebar to update automatically
+   * Fixed updating code completion for generated UI header files
 
 CodePaster
    * Implemented new protocol of pastebin.com including list functionality
@@ -55,6 +60,9 @@ Project support
    * Allow changing the build environment for Generic Projects
    * Added context menu options to open file manager or terminal in a files
      directory
+   * Fixed the DEFINES and INCLUDES set in .pro files to be dealt with
+     on a file-specific level and enabled the handling of DEFINES.
+     Also, the .qmake.cache is now parsed
 
 Debugging
    * Add on-device debugging for the Symbian platform using gdb
@@ -72,6 +80,10 @@ Debugging
      names
    * pdb: Added some basic debugging for Python scripts based on pdb
    * Improvements in the dialogs, status messages, and general appearance
+   * Fixed debugging helpers to work while debugging applications on devices
+   * On Linux and Windows, enabled installing Qt with one user account and
+     then using it with another without workarounds
+   * Fixed all data types to work in the Watch Window of CDB
 
 Help
 
@@ -82,11 +94,6 @@ QML/JS Support
 
   * New qml based .qmlproject file format (replaces old format)
 
-  * New QmlDesigner
-     * Allows visual manipulation of .qml files
-     * Supports changing top-level states
-     * Integrates tighly with text editor, e.g. shared history, navigation facilities ...
-
 Platform Specific
 
 Mac

doc/doc.pri

@@ -7,18 +7,28 @@ equals(QMAKE_DIR_SEP, /) {   # unix, mingw+msys
     # The lack of spaces in front of the && is necessary!
     QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
 } else {   # nmake
-    QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \
-           set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\n\t) \
+    QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \
+           set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
            $$QDOC_BIN
 }
 
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
 QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
 
+HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
+                 $$PWD/addressbook-sdk.qdoc \
+                 $$PWD/qt-defines.qdocconf \
+                 $$PWD/qt-html-templates.qdocconf \
+                 $$PWD/qtcreator.qdocconf \
+                 $$PWD/qtcreator-online.qdocconf
+
 html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
-html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf
+html_docs.depends += $$HELP_DEP_FILES
 html_docs.files = $$QHP_FILE
 
+html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
+html_docs_online.depends += $$HELP_DEP_FILES
+
 qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
 qch_docs.depends += html_docs
 qch_docs.files = $$QCH_FILE
@@ -29,10 +39,10 @@ unix:!macx {
     INSTALLS += qch_docs
 }
 
+docs_online.depends = html_docs_online
 docs.depends = qch_docs
-QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
+QMAKE_EXTRA_TARGETS += html_docs html_docs_online qch_docs docs docs_online
 
-OTHER_FILES = $$PWD/qtcreator.qdoc \
-              $$PWD/qtcreator.qdocconf
-OTHER_FILES += $$PWD/api/qtcreator-api.qdoc \
-               $$PWD/api/qtcreator-api.qdocconf
+OTHER_FILES = $$HELP_DEP_FILES \
+              $$PWD/api/qtcreator-api.qdoc \
+              $$PWD/api/qtcreator-api.qdocconf

doc/examples/batteryindicator/BatteryIndicator.pro

+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-05-26T16:46:58
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+TARGET = BatteryIndicator
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+        batteryindicator.cpp
+
+HEADERS  += batteryindicator.h
+
+FORMS    += batteryindicator.ui
+
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.UID3 = 0xecbd72d7
+    # TARGET.CAPABILITY += 
+    TARGET.EPOCSTACKSIZE = 0x14000
+    TARGET.EPOCHEAPSIZE = 0x020000 0x800000
+}

doc/examples/batteryindicator/batteryindicator.cpp

+#include "batteryindicator.h"
+#include "ui_batteryindicator.h"
+
+//! [2]
+BatteryIndicator::BatteryIndicator(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BatteryIndicator),
+    deviceInfo(NULL)
+{
+    ui->setupUi(this);
+    setupGeneral();
+}
+//! [2]
+
+BatteryIndicator::~BatteryIndicator()
+{
+    delete ui;
+}
+
+//! [1]
+void BatteryIndicator::setupGeneral()
+{
+    deviceInfo = new QSystemDeviceInfo(this);
+
+    ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
+
+    connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
+            ui->batteryLevelBar, SLOT(setValue(int)));
+}
+//! [1]

doc/examples/batteryindicator/batteryindicator.h

+#ifndef BATTERYINDICATOR_H
+#define BATTERYINDICATOR_H
+
+#include <QDialog>
+
+//! [1]
+#include <QSystemInfo>
+//! [1]
+
+//! [2]
+QTM_USE_NAMESPACE
+//! [2]
+
+namespace Ui {
+    class BatteryIndicator;
+}
+
+class BatteryIndicator : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit BatteryIndicator(QWidget *parent = 0);
+    ~BatteryIndicator();
+
+//! [3]
+private:
+    Ui::BatteryIndicator *ui;
+    void setupGeneral();
+
+    QSystemDeviceInfo *deviceInfo;
+//! [3]
+};
+
+#endif // BATTERYINDICATOR_H

doc/examples/batteryindicator/batteryindicator.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BatteryIndicator</class>
+ <widget class="QDialog" name="BatteryIndicator">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>BatteryIndicator</string>
+  </property>
+  <widget class="QProgressBar" name="batteryLevelBar">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>118</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="value">
+    <number>24</number>
+   </property>
+  </widget>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

doc/examples/batteryindicator/main.cpp

+#include <QtGui/QApplication>
+#include "batteryindicator.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    BatteryIndicator w;
+#if defined(Q_WS_S60)
+    w.showMaximized();
+#else
+    w.show();
+#endif
+
+    return a.exec();
+}