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();
+}

doc/qt-defines.qdocconf

@@ -20,52 +20,46 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-			  api_examples.png \
-			  bg_ll.png \
-			  bg_ul_blank.png \
-			  bullet_gt.png \
-			  horBar.png \
-			  qt_ref_doc.png \
-			  api_lookup.png \
-			  bg_ll_blank.png \
-			  bg_ur.png \
-			  bullet_sq.png \
-			  bullet_dn.png \
-			  bullet_up.png \
-			  page_bg.png \
-			  qt_tools.png \
-			  api_topics.png \
-			  bg_lr.png \
-			  bg_ur_blank.png \
-			  content_bg.png \
-			  print.png \
-			  sep.png \
-			  bg_l.png \
-			  bg_r.png \
-			  box_bg.png \
-			  feedbackground.png \
-			  qt_guide.png \
-			  sprites-combined.png \
-			  bg_l_blank.png \
-			  bg_ul.png \
-			  breadcrumb.png \
-			  form_bg.png \
-			  qt_icon.png \
-			  header.png \
-                          qtcreator-screenshots.png \
-                          taskmenuextension-example.png \
-                          coloreditorfactoryimage.png \
-                          dynamiclayouts-example.png \
-                          stylesheet-coffee-plastique.png
+                          api_examples.png \
+                          api_lookup.png \
+                          arrow_down.png \
+                          bg_ll.png \
+                          bg_l.png \
+                          bg_lr.png \
+                          bg_r.png \
+                          bg_ul_blank.png \
+                          bg_ll_blank.png \
+                          bg_l_blank.png \
+                          breadcrumb.png \
+                          bullet_dn.png \
+                          bullet_gt.png \
+                          bullet_sq.png \
+                          box_bg.png \
+                          feedbackground.png \
+                          horBar.png \
+                          page_bg.png \
+                          sprites-combined.png \
+                          qtcreator-screenshots.png
 
 # This stuff is used by the new doc format.
 scriptdirs              = $SRCDIR/templates/scripts
 styledirs               = $SRCDIR/templates/style
 
 scripts.HTML		= functions.js \
+			  shBrushCpp.js \
+			  shCore.js \
+			  shLegacy.js \
+			  narrow.js \
+			  superfish.js \
 			  jquery.js
 
 styles.HTML		= style.css \
+			  shCore.css \
+			  shThemeDefault.css \
+			  narrow.css \
+			  superfish.css \
+			  superfish_skin.css \
+			  OfflineStyle.css \
 			  style_ie6.css \
 			  style_ie7.css \
 			  style_ie8.css

doc/qt-html-templates.qdocconf

-HTML.stylesheets        = style/style.css
+HTML.stylesheets        =  style/style.css \
+                           style/OfflineStyle.css \
+                           style/style_ie7.css \
+                           style/style_ie8.css \
+                           style/style_ie6.css
+
 HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+			  "    <div class=\"content\"> \n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
 			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Creator Documentation</span></a>\n" \
+			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+			  "		<fieldset>\n" \
+              "		<input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+			  "		 </fieldset>\n" \
+			  "		</form></div>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
@@ -16,10 +27,11 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    </div>\n" \
 			  "    <div id=\"shortCut\">\n" \
 			  "      <ul>\n" \
-			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 1.3.84 </a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL Versions" \
+			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.0.0 </a></span></li>\n" \
+			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
+			  "     </div>\n" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
@@ -31,55 +43,49 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        <div class=\"searchlabel\">\n" \
 			  "          Search index:</div>\n" \
 			  "        <div class=\"search\">\n" \
-			  "          <form id=\"qtdocsearch\" action=\"#\">\n" \
+			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
 			  "            <fieldset>\n" \
-			  "              <input type=\"text\" name=\"searchstring\" id=\"searchstring\" value=\"\" onkeyup=\"doSearch(this.value);\" />\n" \
+			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
 			  "            </fieldset>\n" \
 			  "          </form>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-			  "          <h2>\n" \
+			  "          <h2 title=\"API Lookup\"><span></span>\n" \
 			  "            API Lookup</h2>\n" \
-			  "          <div class=\"list\">\n" \
-			  "            <ul>\n" \
-			  "              <li><a href=\"modules.html\">All modules</a></li>\n" \
-			  "              <li><a href=\"classes.html\">All classes</a></li>\n" \
-			  "              <li><a href=\"functions.html\">All functions</a></li>\n" \
-			  "              <li><a href=\"namespaces.html\">All namespaces</a></li>\n" \
-			  "              <li><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
-			  "            </ul>\n" \
-			  "          </div>\n" \
-			  "          <div class=\"live\">\n" \
+			  "          <div  id=\"list001\" class=\"list\">\n" \
+			  "          <ul id=\"ul001\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/classes.html\">Class index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/functions.html\">Function index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/modules.html\">Modules</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/namespaces.html\">Namespaces</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtglobal.html\">Global stuff</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeelements.html\">QML elements</a></li>\n" \
+			  "            </ul> \n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
-			  "          <h2>\n" \
-			  "            API Topics</h2>\n" \
-			  "          <div class=\"list\">\n" \
-			  "            <ul>\n" \
-			  "              <li><a href=\"object.html\">QObject model</a></li>\n" \
-			  "              <li><a href=\"eventsandfilters.html\">Events, signals &amp; slots</a></li>\n" \
-			  "              <li><a href=\"paintsystem.html\">Graphics &amp; Paint system</a></li>\n" \
-			  "              <li><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \
-			  "              <li><a href=\"widgets-and-layouts.html\">Widget style &amp; layout</a></li>\n" \
-			  "            </ul>\n" \
-			  "          </div>\n" \
-			  "          <div class=\"live\">\n" \
+			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
+			  "            Qt Topics</h2>\n" \
+			  "          <div id=\"list002\" class=\"list\">\n" \
+			  "            <ul id=\"ul002\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/platform-specific.html\">Platform-specific info</a></li>\n" \
+			  "            </ul>  \n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box\" id=\"examples\">\n" \
-			  "          <h2>\n" \
-			  "            API Examples</h2>\n" \
-			  "          <div class=\"list\">\n" \
-			  "            <ul>\n" \
-			  "              <li><a href=\"examples.html\">All examples</a></li>\n" \
-			  "              <li><a href=\"tutorials.html\">All tutorials</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Qt Quick examples</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Desktop examples</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Device examples</a></li>\n" \
-			  "            </ul>\n" \
-			  "          </div>\n" \
-			  "          <div class=\"live\">\n" \
+			  "          <h2 title=\"Examples\"><span></span>\n" \
+			  "            Examples</h2>\n" \
+			  "          <div id=\"list003\" class=\"list\">\n" \
+			  "        <ul id=\"ul003\">\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/all-examples.html\">Examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/tutorials.html\">Tutorials</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/demos.html\">Demos</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+			  "            </ul> \n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "      </div>\n" \
@@ -98,20 +104,21 @@ HTML.postpostheader     = "            </ul>\n" \
 			  "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
 			  "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
 			  "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
-			  "                <img src=\"images/sep.png\" alt=\"\" /><img id=\"printIcon\" src=\"images/print.png\" alt=\"Print this page\" /></a></li>\n" \
+			  "                <span>Print</span></a></li>\n" \
 			  "            </ul>\n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"content\">\n"
 
-HTML.footer             = "        </div>\n" \
-			  "        <div class=\"feedback t_button\" onclick=\"\$(\'#feedbackBox\').show();\$(\'#blurpage\').show()\">\n" \
+HTML.footer             = "        <!-- /div -->\n" \
+			  "        <div class=\"feedback t_button\">\n" \
 			  "          [+] Documentation Feedback</div>\n" \
 			  "      </div>\n" \
 			  "    </div>\n" \
 			  "    <div class=\"ft\">\n" \
 			  "      <span></span>\n" \
 			  "    </div>\n" \
+			  "  </div> \n" \
 			  "  <div class=\"footer\">\n" \
 			  "    <p>\n" \
 			  "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
@@ -122,13 +129,10 @@ HTML.footer             = "        </div>\n" \
 			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"feedbackBox\">\n" \
-			  "      <div id=\"feedcloseX\">\n" \
-			  "        <a href=\"#\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\">X</a>\n" \
-			  "      </div>\n" \
-			  "    <form action=\"#\">\n" \
-			  "      <textarea id=\"feedbox\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea>\n" \
-			  "      <input id=\"feedsubmit\" type=\"submit\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\"\n" \
-			  "        name=\"feedback\" />\n" \
+			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
+			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"blurpage\">\n" \

doc/qtcreator-online.qdocconf

+online                  = true
+# Run qdoc from the directory that contains this file.
+include(qtcreator.qdocconf)
+

doc/qtcreator.qdocconf

@@ -19,48 +19,42 @@ sources.fileextensions  = "qtcreator.qdoc addressbook-sdk.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.1384
+qhp.QtCreator.namespace        = com.nokia.qtcreator.200
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
-qhp.QtCreator.filterAttributes = qtcreator 1.3.84
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.3.84
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.3.84
+qhp.QtCreator.filterAttributes = qtcreator 2.0.0
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.0
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.0
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = \
                           style/style.css \
                           style/style_ie6.css \
                           style/style_ie7.css \
                           style/style_ie8.css \
+                          style/OfflineStyle.css \
                           images/qt-logo.png \
                           images/qtcreator-screenshots.png \
                           scripts/functions.js \
                           scripts/jquery.js \
                           images/api_examples.png \
                           images/api_lookup.png \
-                          images/api_topics.png \
+                          images/arrow_down.png \
                           images/bg_ll.png \
-                          images/bg_l_blank.png \
                           images/bg_l.png \
                           images/bg_lr.png \
                           images/bg_r.png \
                           images/bg_ul_blank.png \
-                          images/bg_ul.png \
-                          images/bg_ur_blank.png \
-                          images/bg_ur.png \
+                          images/bg_ll_blank.png \
+                          images/bg_l_blank.png \
                           images/breadcrumb.png \
                           images/bullet_dn.png \
                           images/bullet_gt.png \
+                          images/bullet_sq.png \
+                          images/box_bg.png \
                           images/feedbackground.png \
-                          images/form_bg.png \
                           images/horBar.png \
                           images/page_bg.png \
-                          images/print.png \
-                          images/qt_guide.png \
                           images/qt-logo.png \
-                          images/qt_ref_doc.png \
-                          images/qt_tools.png \
-                          images/sep.png \
-                          images/header.png \
                           images/sprites-combined.png
 
 # macros.qdocconf

doc/templates/scripts/functions.js

-
 /* START non link areas where cursor should change to pointing hand */
 $('.t_button').mouseover(function() {
     $('.t_button').css('cursor','pointer');
 		/*document.getElementById(this.id).style.cursor='pointer';*/
 });
-
 /* END non link areas  */
 $('#smallA').click(function() {
 		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller');
@@ -20,6 +18,7 @@ $('#medA').click(function() {
 		$('.content p').css('font','13px/20px Verdana');
 		$('.content li').css('font','400 13px/1 Verdana');
 		$('.content li').css('line-height','14px');
+		$('.content .toc li').css('font', 'normal 10px/1.2 Verdana');
 		$('.content table').css('font','13px/1.2 Verdana');
 		$('.content .heading').css('font','600 16px/1 Arial');
 		$('.content .indexboxcont li').css('font','600 13px/1 Verdana');
@@ -34,27 +33,160 @@ $('#bigA').click(function() {
 		$(this).addClass('active')
 });
 
-function doSearch(str){
-
-if (str.length>3)
-  {
-  alert('start search');
- // document.getElementById("refWrapper").innerHTML="";
-  return;
-  }
- else
-  return;
-    
-//    var url="indexSearch.php";
-//    url=url+"?q="+str;
- //   url=url+"&sid="+Math.random();
-   // var url="http://localhost:8983/solr/select?";
-   // url=url+"&q="+str;
-   // url=url+"&fq=&start=0&rows=10&fl=&qt=&wt=&explainOther=&hl.fl=";
-    
-  //  $.get(url, function(data){ 
-   // alert(data);
-  // document.getElementById("refWrapper").innerHTML=data; 
- //});
-   
-}
\ No newline at end of file
+$('.feedclose').click(function() {
+	$('.bd').show();
+	$('.hd').show();
+	$('.footer').show();
+	$('#feedbackBox').hide();
+	$('#blurpage').hide();
+});
+
+$('.feedback').click(function() {
+	$('.bd').hide();
+	$('.hd').hide();
+	$('.footer').hide();
+	$('#feedbackBox').show();
+	$('#blurpage').show();
+});
+var lookupCount = 0;
+var articleCount = 0;
+var exampleCount = 0;
+var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
+
+function processNokiaData(response){
+	var propertyTags = response.getElementsByTagName('page');
+	
+ 	for (var i=0; i< propertyTags.length; i++) {
+		var linkStart   = "<li class=\"liveResult\"><a href='"+qturl+"";
+		var linkEnd  = "</a></li>";
+		
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
+			lookupCount++;
+
+			
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
+					
+				$('#ul001').append(full_li_element);
+			$('#ul001 .defaultLink').css('display','none');
+
+		   		}
+			}
+	 
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
+			articleCount++;
+
+				 
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
+					
+				$('#ul002').append(full_li_element);
+			$('#ul002 .defaultLink').css('display','none');
+
+	   		}
+		}
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
+			exampleCount++;
+
+
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
+					
+				$('#ul003').append(full_li_element);
+			$('#ul003 .defaultLink').css('display','none');
+
+	   		}
+		} 
+		if(i==propertyTags.length){$('#pageType').removeClass('loading');}
+
+	}	
+	 
+	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
+    if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
+	if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
+	// reset count variables;
+	 lookupCount=0;
+	 articleCount = 0;
+     exampleCount = 0;
+	
+}
+//build regular expression object to find empty string or any number of blank
+var blankRE=/^\s*$/;
+function CheckEmptyAndLoadList()
+{
+	var pageUrl = window.location.href;
+	var pageVal = $('title').html();
+	$('#feedUrl').remove();
+	$('#pageVal').remove();
+	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
+	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
+	$('.liveResult').remove();
+    $('.defaultLink').css('display','block');
+	var value = document.getElementById('pageType').value; 
+	if((blankRE.test(value)) || (value.length < 3))
+	{
+	//empty inputbox
+		// load default li elements into the ul if empty
+	//	loadAllList(); // replaced
+	 $('.defaultLink').css('display','block');
+	// $('.liveResult').css('display','none');
+	}else{
+	 $('.defaultLink').css('display','none');
+	}
+}
+/*
+$(window).resize(function(){
+if($(window).width()<400)
+	$('body').addClass('offline');
+else
+	$('body').removeClass('offline');
+	});
+	*/
+// Loads on doc ready
+	$(document).ready(function () {
+	//alert(pageUrl);
+	//$('#pageUrl').attr('foo',pageUrl);
+	var pageTitle = $('title').html();
+          var currentString = $('#pageType').val() ;
+		  if(currentString.length < 1){