Merge branch 'master' of ../qt-qml-staging

92 files changed, 24514 insertions, 7024 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 4503235..ab19a04 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -752,7 +752,7 @@ void Configure::parseCmdLine()
             } else if ( configCmdLine.at(i) == "es2" ) {
                 dictionary[ "OPENGL_ES_2" ]     = "yes";
             } else if ( configCmdLine.at(i) == "desktop" ) {
-                dictionary[ "OPENGL_ES_2" ]     = "yes";
+                // OPENGL=yes suffices
             } else {
                 cout << "Argument passed to -opengl option is not valid." << endl;
                 dictionary[ "DONE" ] = "error";
diff --git a/tools/designer/src/components/buddyeditor/buddyeditor.cpp b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
index d35415d..34e1681 100644
--- a/tools/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/tools/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -51,6 +51,7 @@
 #include <qdesigner_utils_p.h>
 #include <qlayout_widget_p.h>
 #include <connectionedit_p.h>
+#include <metadatabase_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtGui/QLabel>
@@ -75,7 +76,8 @@ static bool canBeBuddy(QWidget *w, QDesignerFormWindowInterface *form)
         if (index != -1) {
             bool ok = false;
             const Qt::FocusPolicy q = static_cast<Qt::FocusPolicy>(qdesigner_internal::Utils::valueOf(sheet->property(index), &ok));
-            return ok && q != Qt::NoFocus;
+            // Refuse No-focus unless the widget is promoted.
+            return (ok && q != Qt::NoFocus) || qdesigner_internal::isPromoted(form->core(), w);
         }
     }
     return false;
diff --git a/tools/designer/src/lib/sdk/membersheet.qdoc b/tools/designer/src/lib/sdk/membersheet.qdoc
index fdd13f2..57a3664 100644
--- a/tools/designer/src/lib/sdk/membersheet.qdoc
+++ b/tools/designer/src/lib/sdk/membersheet.qdoc
@@ -40,7 +40,7 @@
     manipulate the member functions' appearance in \QD's signals and
     slots editing mode. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 2
 
     When implementing a custom widget plugin, a pointer to \QD's
     current QDesignerFormEditorInterface object (\c formEditor in the
@@ -69,7 +69,7 @@
     made known to the meta object system using the Q_INTERFACES()
     macro:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 3
 
     This enables \QD to use qobject_cast() to query for
     supported interfaces using nothing but a QObject pointer.
@@ -101,13 +101,13 @@
     QExtensionFactory and reimplement the
     QExtensionFactory::createExtension() function. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 4
 
     Or you can use an existing factory, expanding the
     QExtensionFactory::createExtension() function to make the factory
     able to create a member sheet extension as well. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 5
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 5
 
     For a complete example using an extension class, see \l
     {designer/taskmenuextension}{Task Menu Extension example}. The
diff --git a/tools/designer/src/lib/sdk/propertysheet.qdoc b/tools/designer/src/lib/sdk/propertysheet.qdoc
index d82de88..becc74b 100644
--- a/tools/designer/src/lib/sdk/propertysheet.qdoc
+++ b/tools/designer/src/lib/sdk/propertysheet.qdoc
@@ -41,7 +41,7 @@
     manipulate the properties' appearance in the property editor. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 15
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 15
 
     Note that if you change the value of a property using the
     QDesignerPropertySheetExtension::setProperty() function, the undo
@@ -80,7 +80,7 @@
     an interface, we must ensure that it's made known to the meta
     object system using the Q_INTERFACES() macro:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 16
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 16
 
     This enables \QD to use qobject_cast() to query for supported
     interfaces using nothing but a QObject pointer.
@@ -112,14 +112,14 @@
     reimplement the QExtensionFactory::createExtension() function. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 17
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 17
 
     Or you can use an existing factory, expanding the
     QExtensionFactory::createExtension() function to make the factory
     able to create a property sheet extension extension as well. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 18
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 18
 
     For a complete example using an extension class, see the \l
     {designer/taskmenuextension}{Task Menu Extension example}. The
diff --git a/tools/designer/src/lib/sdk/taskmenu.qdoc b/tools/designer/src/lib/sdk/taskmenu.qdoc
index 06d0b96..c5a3795 100644
--- a/tools/designer/src/lib/sdk/taskmenu.qdoc
+++ b/tools/designer/src/lib/sdk/taskmenu.qdoc
@@ -51,7 +51,7 @@
     inherit from both QObject and QDesignerTaskMenuExtension. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 9
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 9
 
     Since we are implementing an interface, we must ensure that it
     is made known to the meta-object system using the Q_INTERFACES()
@@ -94,13 +94,13 @@
     reimplement the QExtensionFactory::createExtension() function. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 10
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 10
 
     Or you can use an existing factory, expanding the
     QExtensionFactory::createExtension() function to make the factory
     able to create a task menu extension as well. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 11
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 11
 
     For a complete example using the QDesignerTaskMenuExtension class,
     see the \l {designer/taskmenuextension}{Task Menu Extension
diff --git a/tools/designer/src/lib/shared/shared.pri b/tools/designer/src/lib/shared/shared.pri
index 8286360..9d50911 100644
--- a/tools/designer/src/lib/shared/shared.pri
+++ b/tools/designer/src/lib/shared/shared.pri
@@ -2,7 +2,7 @@
 INCLUDEPATH += $$PWD
 contains(QT_CONFIG, script): QT += script
 
-include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
+include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
 include(../../../../shared/deviceskin/deviceskin.pri)
 include(../../../../../src/tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 402a771..ecb43db 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -2291,6 +2291,7 @@ void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, Do
         DomPropertyList attributes = ui_widget->elementAttribute();
         DomString *domString = new DomString();
         domString->setText(buttonGroup->objectName());
+        domString->setAttributeNotr(QLatin1String("true"));
         DomProperty *domProperty = new DomProperty();
         domProperty->setAttributeName(QLatin1String(buttonGroupPropertyC));
         domProperty->setElementString(domString);
diff --git a/tools/designer/src/lib/uilib/container.qdoc b/tools/designer/src/lib/uilib/container.qdoc
index 51d942e..d931051 100644
--- a/tools/designer/src/lib/uilib/container.qdoc
+++ b/tools/designer/src/lib/uilib/container.qdoc
@@ -44,7 +44,7 @@
     To create a container extension, your extension class must inherit
     from both QObject and QDesignerContainerExtension. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 6
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 6
 
     Since we are implementing an interface, we must ensure that it's
     made known to the meta object system using the Q_INTERFACES()
@@ -88,13 +88,13 @@
     reimplement the QExtensionFactory::createExtension() function. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 7
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 7
 
     Or you can use an existing factory, expanding the
     QExtensionFactory::createExtension() function to make the factory
     able to create a container extension as well. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 8
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 8
 
     For a complete example using the QDesignerContainerExtension
     class, see the \l {designer/containerextension}{Container
diff --git a/tools/designer/src/lib/uilib/customwidget.qdoc b/tools/designer/src/lib/uilib/customwidget.qdoc
index 3410fc6..d5ddaa7 100644
--- a/tools/designer/src/lib/uilib/customwidget.qdoc
+++ b/tools/designer/src/lib/uilib/customwidget.qdoc
@@ -73,7 +73,7 @@
     class called \c MyCustomWidget, we can export it by adding the
     following line to the file containing the plugin implementation:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 14
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 14
 
     This macro ensures that \QD can access and construct the custom widget.
     Without this macro, there is no way for \QD to use it.
@@ -264,13 +264,13 @@
     several custom widgets \c CustomWidgetOne, \c CustomWidgetTwo and
     \c CustomWidgetThree, the class definition may look like this:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 12
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 12
 
     In the class constructor you add the interfaces to your custom
     widgets to the list which you return in the customWidgets()
     function:
 
-    \snippet doc/src/snippets/code/doc_src_qtdesigner.qdoc 13
+    \snippet doc/src/snippets/code/doc_src_qtdesigner.cpp 13
 
     Note that instead of exporting each custom widget plugin using the
     Q_EXPORT_PLUGIN2() macro, you export the entire collection. The
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp
index 7b30643..0b4bd9e 100644
--- a/tools/linguist/shared/qm.cpp
+++ b/tools/linguist/shared/qm.cpp
@@ -723,7 +723,7 @@ static bool saveQM(const Translator &translator, QIODevice &dev, ConversionData
                 continue;
             }
             if (typ == TranslatorMessage::Unfinished) {
-                if (!cd.m_idBased && msg.translation().isEmpty()) {
+                if (msg.translation().isEmpty() && !cd.m_idBased && cd.m_unTrPrefix.isEmpty()) {
                     ++untranslated;
                     continue;
                 } else {
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index fb473c7..2d50e5a 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -51,6 +51,7 @@ QString Atom::INDEX_         ("index");
 QString Atom::ITALIC_        ("italic");
 QString Atom::LINK_          ("link");
 QString Atom::PARAMETER_     ("parameter");
+QString Atom::SPAN_          ("span");
 QString Atom::SUBSCRIPT_     ("subscript");
 QString Atom::SUPERSCRIPT_   ("superscript");
 QString Atom::TELETYPE_      ("teletype");
@@ -107,7 +108,8 @@ QString Atom::UPPERROMAN_    ("upperroman");
   \value CodeOld
   \value CodeQuoteArgument
   \value CodeQuoteCommand
-  \value Div
+  \value DivLeft
+  \value DivRight
   \value EndQmlText
   \value FormatElse
   \value FormatEndif
@@ -180,8 +182,8 @@ static const struct {
     { "CodeOld", Atom::CodeOld },
     { "CodeQuoteArgument", Atom::CodeQuoteArgument },
     { "CodeQuoteCommand", Atom::CodeQuoteCommand },
-    { "Div", Atom::Div },
-    { "EndDiv", Atom::EndDiv },
+    { "DivLeft", Atom::DivLeft },
+    { "DivRight", Atom::DivRight },
 #ifdef QDOC_QML
     { "EndQmlText", Atom::EndQmlText },
 #endif
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h
index e3b993e..dbb1a8b 100644
--- a/tools/qdoc3/atom.h
+++ b/tools/qdoc3/atom.h
@@ -46,7 +46,7 @@
 #ifndef ATOM_H
 #define ATOM_H
 
-#include <qstring.h>
+#include <qstringlist.h>
 
 #define QDOC_QML
 
@@ -72,9 +72,9 @@ class Atom
         CodeOld,
         CodeQuoteArgument,
         CodeQuoteCommand,
-        Div,
+        DivLeft,            // 16
+        DivRight,           // 17
 #ifdef QDOC_QML
-        EndDiv,
         EndQmlText,
 #endif
         FootnoteLeft,
@@ -101,10 +101,10 @@ class Atom
         ListLeft,
         ListItemNumber,
         ListTagLeft,        // 40
-        ListTagRight,       // 41
-        ListItemLeft,       // 42
-        ListItemRight,      // 43
-        ListRight,          // 44
+        ListTagRight,
+        ListItemLeft,
+        ListItemRight,
+        ListRight,
         Nop,
         ParaLeft,
         ParaRight,
@@ -115,7 +115,7 @@ class Atom
         QuotationLeft,      // 50
         QuotationRight,
         RawString,
-        SectionLeft,        // 53
+        SectionLeft,
         SectionRight,
         SectionHeadingLeft,
         SectionHeadingRight,
@@ -125,8 +125,8 @@ class Atom
         SnippetCommand,     // 60
         SnippetIdentifier,
         SnippetLocation,
-        String,             // 63
-        TableLeft,          // 64
+        String,
+        TableLeft,
         TableRight,
         TableHeaderLeft,
         TableHeaderRight,
@@ -135,30 +135,57 @@ class Atom
         TableItemLeft,      // 70
         TableItemRight,
         TableOfContents,
-        Target,             // 73
+        Target,
         UnhandledFormat, 
         UnknownCommand,
         Last = UnknownCommand
     };
 
-    Atom(Type type, const QString &string = "")
-	: nxt(0), typ(type), str(string) { }
-    Atom(Atom *prev, Type type, const QString &string = "")
-	: nxt(prev->nxt), typ(type), str(string) { prev->nxt = this; }
-
-    void appendChar(QChar ch) { str += ch; }
-    void appendString(const QString& string) { str += string; }
-    void chopString() { str.chop(1); }
-    void setString(const QString &string) { str = string; }
-    Atom *next() { return nxt; }
-    void setNext(Atom *newNext) { nxt = newNext; }
-
-    const Atom *next() const { return nxt; }
-    const Atom *next(Type t) const;
-    const Atom *next(Type t, const QString& s) const;
+    Atom(Type type, const QString& string = "")
+	: nxt(0), typ(type) 
+    {
+        strs << string; 
+    }
+
+    Atom(Type type, const QString& p1, const QString& p2)
+	: nxt(0), typ(type) 
+    { 
+        strs << p1; 
+        if (!p2.isEmpty()) 
+            strs << p2; 
+    }
+
+    Atom(Atom* prev, Type type, const QString& string = "")
+	: nxt(prev->nxt), typ(type) 
+    { 
+        strs << string; 
+        prev->nxt = this; 
+    }
+    
+    Atom(Atom* prev, Type type, const QString& p1, const QString& p2)
+	: nxt(prev->nxt), typ(type) 
+    { 
+        strs << p1; 
+        if (!p2.isEmpty()) 
+            strs << p2; 
+        prev->nxt = this; 
+    }
+
+    void appendChar(QChar ch) { strs[0] += ch; }
+    void appendString(const QString& string) { strs[0] += string; }
+    void chopString() { strs[0].chop(1); }
+    void setString(const QString& string) { strs[0] = string; }
+    Atom* next() { return nxt; }
+    void setNext(Atom* newNext) { nxt = newNext; }
+
+    const Atom* next() const { return nxt; }
+    const Atom* next(Type t) const;
+    const Atom* next(Type t, const QString& s) const;
     Type type() const { return typ; }
     QString typeString() const;
-    const QString& string() const { return str; }
+    const QString& string() const { return strs[0]; }
+    const QString& string(int i) const { return strs[i]; }
+    int count() const { return strs.size(); }
     void dump() const;
 
     static QString BOLD_;
@@ -166,6 +193,7 @@ class Atom
     static QString ITALIC_;
     static QString LINK_;
     static QString PARAMETER_;
+    static QString SPAN_;
     static QString SUBSCRIPT_;
     static QString SUPERSCRIPT_;
     static QString TELETYPE_;
@@ -181,9 +209,9 @@ class Atom
     static QString UPPERROMAN_;
 
  private:
-    Atom *nxt;
+    Atom* nxt;
     Type typ;
-    QString str;
+    QStringList strs;
 };
 
 #define ATOM_FORMATTING_BOLD            "bold"
@@ -191,6 +219,7 @@ class Atom
 #define ATOM_FORMATTING_ITALIC          "italic"
 #define ATOM_FORMATTING_LINK            "link"
 #define ATOM_FORMATTING_PARAMETER       "parameter"
+#define ATOM_FORMATTING_SPAN            "span "
 #define ATOM_FORMATTING_SUBSCRIPT       "subscript"
 #define ATOM_FORMATTING_SUPERSCRIPT     "superscript"
 #define ATOM_FORMATTING_TELETYPE        "teletype"
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index 58642ef..84a09ce 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -491,7 +491,7 @@ static QString encode(const QString &string)
 #endif
 }
 
-QStringList CodeMarker::macRefsForNode(const Node *node)
+QStringList CodeMarker::macRefsForNode(Node *node)
 {
     QString result = QLatin1String("cpp/");
     switch (node->type()) {
@@ -583,7 +583,7 @@ QStringList CodeMarker::macRefsForNode(const Node *node)
          {
              NodeList list = static_cast<const PropertyNode*>(node)->functions();
              QStringList stringList;
-             foreach (const Node *node, list) {
+             foreach (Node* node, list) {
                 stringList += macRefsForNode(node);
              }
              return stringList;
diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h
index 65fcdd4..21bc31f 100644
--- a/tools/qdoc3/codemarker.h
+++ b/tools/qdoc3/codemarker.h
@@ -155,7 +155,7 @@ class CodeMarker
                                       const Tree* tree,
 		                      const Node* relative,
                                       const Node* self = 0);
-    virtual QStringList macRefsForNode(const Node* node);
+    virtual QStringList macRefsForNode(Node* node);
 
     static void initialize(const Config& config);
     static void terminate();
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index 08a8187..838f6ac 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -329,13 +329,16 @@ QList<QRegExp> Config::getRegExpList(const QString& var) const
 }
 
 /*!
-  This function is slower than it could be.
+  This function is slower than it could be. What it does is
+  find all the keys that begin with \a var + dot and return
+  the matching keys in a set, stripped of the matching prefix
+  and dot.
  */
 QSet<QString> Config::subVars(const QString& var) const
 {
     QSet<QString> result;
     QString varDot = var + QLatin1Char('.');
-    QMap<QString, QString>::ConstIterator v = stringValueMap.begin();
+    QStringMultiMap::ConstIterator v = stringValueMap.begin();
     while (v != stringValueMap.end()) {
         if (v.key().startsWith(varDot)) {
             QString subVar = v.key().mid(varDot.length());
@@ -350,6 +353,27 @@ QSet<QString> Config::subVars(const QString& var) const
 }
 
 /*!
+  Same as subVars(), but in this case we return a string map
+  with the matching keys (stripped of the prefix \a var and
+  mapped to their values. The pairs are inserted into \a t
+ */
+void Config::subVarsAndValues(const QString& var, QStringMultiMap& t) const
+{
+    QString varDot = var + QLatin1Char('.');
+    QStringMultiMap::ConstIterator v = stringValueMap.begin();
+    while (v != stringValueMap.end()) {
+        if (v.key().startsWith(varDot)) {
+            QString subVar = v.key().mid(varDot.length());
+            int dot = subVar.indexOf(QLatin1Char('.'));
+            if (dot != -1)
+                subVar.truncate(dot);
+            t.insert(subVar,v.value());
+        }
+        ++v;
+    }
+}
+
+/*!
   Builds and returns a list of file pathnames for the file
   type specified by \a filesVar (e.g. "headers" or "sources").
   The files are found in the directories specified by
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h
index 9ebc0f8..8e19ed2 100644
--- a/tools/qdoc3/config.h
+++ b/tools/qdoc3/config.h
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+typedef QMultiMap<QString, QString> QStringMultiMap;
+
 class Config
 {
  public:
@@ -74,6 +76,7 @@ class Config
     QRegExp getRegExp(const QString& var) const;
     QList<QRegExp> getRegExpList(const QString& var) const;
     QSet<QString> subVars(const QString& var) const;
+    void subVarsAndValues(const QString& var, QStringMultiMap& t) const;
     QStringList getAllFiles(const QString& filesVar, 
                             const QString& dirsVar,
                             const QSet<QString> &excludedDirs = QSet<QString>());
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 3979176..4d04085 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -97,6 +97,22 @@ QT_BEGIN_NAMESPACE
 #define COMMAND_QMLBASICTYPE            Doc::alias("qmlbasictype")
 #endif
 
+#define COMMAND_AUDIENCE                Doc::alias("audience")
+#define COMMAND_CATEGORY                Doc::alias("category")
+#define COMMAND_PRODNAME                Doc::alias("prodname")
+#define COMMAND_COMPONENT               Doc::alias("component")
+#define COMMAND_AUTHOR                  Doc::alias("author")
+#define COMMAND_PUBLISHER               Doc::alias("publisher")
+#define COMMAND_COPYRYEAR               Doc::alias("copyryear")
+#define COMMAND_COPYRHOLDER             Doc::alias("copyrholder")
+#define COMMAND_PERMISSIONS             Doc::alias("permissions")
+#define COMMAND_LIFECYCLEVERSION        Doc::alias("lifecycleversion")
+#define COMMAND_LIFECYCLEWSTATUS        Doc::alias("lifecyclestatus")
+#define COMMAND_LICENSEYEAR             Doc::alias("licenseyear")
+#define COMMAND_LICENSENAME             Doc::alias("licensename")
+#define COMMAND_LICENSEDESCRIPTION      Doc::alias("licensedescription")
+#define COMMAND_RELEASEDATE             Doc::alias("releasedate")
+
 QStringList CppCodeParser::exampleFiles;
 QStringList CppCodeParser::exampleDirs;
 
@@ -863,10 +879,12 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
         }
         if (qmlPropGroup) {
             const ClassNode *correspondingClass = static_cast<const QmlClassNode*>(qmlPropGroup->parent())->classNode();
-            PropertyNode *correspondingProperty = 0;
-            if (correspondingClass)
-                correspondingProperty = static_cast<PropertyNode*>((Node*)correspondingClass->findNode(property, Node::Property));
             QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlPropGroup,property,type,attached);
+
+            const PropertyNode *correspondingProperty = 0;
+            if (correspondingClass) {
+                correspondingProperty = qmlPropNode->correspondingProperty(tre);
+            }
             if (correspondingProperty) {
                 bool writableList = type.startsWith("list") && correspondingProperty->dataType().endsWith('*');
                 qmlPropNode->setWritable(writableList || correspondingProperty->isWritable());
@@ -1809,7 +1827,7 @@ bool CppCodeParser::matchProperty(InnerNode *parent)
              !match(Tok_QDOC_PROPERTY)) {
         return false;
     }
-    
+
     if (!match(expected_tok))
         return false;
 
@@ -1829,7 +1847,7 @@ bool CppCodeParser::matchProperty(InnerNode *parent)
         QString key = previousLexeme();
         QString value;
 
-        if (match(Tok_Ident)) {
+        if (match(Tok_Ident) || match(Tok_Number)) {
             value = previousLexeme();
         }
         else if (match(Tok_LeftParen)) {
@@ -1872,8 +1890,15 @@ bool CppCodeParser::matchProperty(InnerNode *parent)
             tre->addPropertyFunction(property, value, PropertyNode::Resetter);
         else if (key == "NOTIFY") {
             tre->addPropertyFunction(property, value, PropertyNode::Notifier);
-        }
-        else if (key == "SCRIPTABLE") {
+        } else if (key == "REVISION") {
+            int revision;
+            bool ok;
+            revision = value.toInt(&ok);
+            if (ok)
+                property->setRevision(revision);
+            else
+                parent->doc().location().warning(tr("Invalid revision number: %1").arg(value));
+        } else if (key == "SCRIPTABLE") {
             QString v = value.toLower();
             if (v == "true")
                 property->setScriptable(true);
@@ -1884,9 +1909,9 @@ bool CppCodeParser::matchProperty(InnerNode *parent)
                 property->setRuntimeScrFunc(value);
             }
         }
-        else if (key == "COSTANT") 
+        else if (key == "CONSTANT")
             property->setConstant();
-        else if (key == "FINAL") 
+        else if (key == "FINAL")
             property->setFinal();
     }
     match(Tok_RightParen);
diff --git a/tools/qdoc3/declarativeparser/parser.pri b/tools/qdoc3/declarativeparser/parser.pri
new file mode 100644
index 0000000..fd4361c
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/parser.pri
@@ -0,0 +1,21 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/qdeclarativejsast_p.h \
+    $$PWD/qdeclarativejsastfwd_p.h \
+    $$PWD/qdeclarativejsastvisitor_p.h \
+    $$PWD/qdeclarativejsengine_p.h \
+    $$PWD/qdeclarativejsgrammar_p.h \
+    $$PWD/qdeclarativejslexer_p.h \
+    $$PWD/qdeclarativejsmemorypool_p.h \
+    $$PWD/qdeclarativejsnodepool_p.h \
+    $$PWD/qdeclarativejsparser_p.h \
+    $$PWD/qdeclarativejsglobal_p.h
+
+SOURCES += \
+    $$PWD/qdeclarativejsast.cpp \
+    $$PWD/qdeclarativejsastvisitor.cpp \
+    $$PWD/qdeclarativejsengine_p.cpp \
+    $$PWD/qdeclarativejsgrammar.cpp \
+    $$PWD/qdeclarativejslexer.cpp \
+    $$PWD/qdeclarativejsparser.cpp
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejs.g b/tools/qdoc3/declarativeparser/qdeclarativejs.g
new file mode 100644
index 0000000..0e7454e
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejs.g
@@ -0,0 +1,3149 @@
+----------------------------------------------------------------------------
+--
+-- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+-- All rights reserved.
+-- Contact: Nokia Corporation (qt-info@nokia.com)
+--
+-- This file is part of the QtDeclarative module of the Qt Toolkit.
+--
+-- $QT_BEGIN_LICENSE:LGPL-ONLY$
+-- GNU Lesser General Public License Usage
+-- This file may be used under the terms of the GNU Lesser
+-- General Public License version 2.1 as published by the Free Software
+-- Foundation and appearing in the file LICENSE.LGPL included in the
+-- packaging of this file.  Please review the following information to
+-- ensure the GNU Lesser General Public License version 2.1 requirements
+-- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+--
+-- If you have questions regarding the use of this file, please contact
+-- Nokia at qt-info@nokia.com.
+-- $QT_END_LICENSE$
+--
+----------------------------------------------------------------------------
+
+%parser         QDeclarativeJSGrammar
+%decl           qdeclarativejsparser_p.h
+%impl           qdeclarativejsparser.cpp
+%expect         2
+%expect-rr      2
+
+%token T_AND "&"                T_AND_AND "&&"              T_AND_EQ "&="
+%token T_BREAK "break"          T_CASE "case"               T_CATCH "catch"
+%token T_COLON ":"              T_COMMA ";"                 T_CONTINUE "continue"
+%token T_DEFAULT "default"      T_DELETE "delete"           T_DIVIDE_ "/"
+%token T_DIVIDE_EQ "/="         T_DO "do"                   T_DOT "."
+%token T_ELSE "else"            T_EQ "="                    T_EQ_EQ "=="
+%token T_EQ_EQ_EQ "==="         T_FINALLY "finally"         T_FOR "for"
+%token T_FUNCTION "function"    T_GE ">="                   T_GT ">"
+%token T_GT_GT ">>"             T_GT_GT_EQ ">>="            T_GT_GT_GT ">>>"
+%token T_GT_GT_GT_EQ ">>>="     T_IDENTIFIER "identifier"   T_IF "if"
+%token T_IN "in"                T_INSTANCEOF "instanceof"   T_LBRACE "{"
+%token T_LBRACKET "["           T_LE "<="                   T_LPAREN "("
+%token T_LT "<"                 T_LT_LT "<<"                T_LT_LT_EQ "<<="
+%token T_MINUS "-"              T_MINUS_EQ "-="             T_MINUS_MINUS "--"
+%token T_NEW "new"              T_NOT "!"                   T_NOT_EQ "!="
+%token T_NOT_EQ_EQ "!=="        T_NUMERIC_LITERAL "numeric literal"     T_OR "|"
+%token T_OR_EQ "|="             T_OR_OR "||"                T_PLUS "+"
+%token T_PLUS_EQ "+="           T_PLUS_PLUS "++"            T_QUESTION "?"
+%token T_RBRACE "}"             T_RBRACKET "]"              T_REMAINDER "%"
+%token T_REMAINDER_EQ "%="      T_RETURN "return"           T_RPAREN ")"
+%token T_SEMICOLON ";"          T_AUTOMATIC_SEMICOLON       T_STAR "*"
+%token T_STAR_EQ "*="           T_STRING_LITERAL "string literal"
+%token T_PROPERTY "property"    T_SIGNAL "signal"           T_READONLY "readonly"
+%token T_SWITCH "switch"        T_THIS "this"               T_THROW "throw"
+%token T_TILDE "~"              T_TRY "try"                 T_TYPEOF "typeof"
+%token T_VAR "var"              T_VOID "void"               T_WHILE "while"
+%token T_WITH "with"            T_XOR "^"                   T_XOR_EQ "^="
+%token T_NULL "null"            T_TRUE "true"               T_FALSE "false"
+%token T_CONST "const"
+%token T_DEBUGGER "debugger"
+%token T_RESERVED_WORD "reserved word"
+%token T_MULTILINE_STRING_LITERAL "multiline string literal"
+%token T_COMMENT "comment"
+
+--- context keywords.
+%token T_PUBLIC "public"
+%token T_IMPORT "import"
+%token T_AS "as"
+%token T_ON "on"
+
+--- feed tokens
+%token T_FEED_UI_PROGRAM
+%token T_FEED_UI_OBJECT_MEMBER
+%token T_FEED_JS_STATEMENT
+%token T_FEED_JS_EXPRESSION
+%token T_FEED_JS_SOURCE_ELEMENT
+%token T_FEED_JS_PROGRAM
+
+%nonassoc SHIFT_THERE
+%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY
+%nonassoc REDUCE_HERE
+
+%start TopLevel
+
+/./****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QtDebug>
+#include <QtGui/QApplication>
+
+#include <string.h>
+
+#include "private/qdeclarativejsengine_p.h"
+#include "private/qdeclarativejslexer_p.h"
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsnodepool_p.h"
+
+./
+
+/:/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+#ifndef QDECLARATIVEJSPARSER_P_H
+#define QDECLARATIVEJSPARSER_P_H
+
+#include "private/qdeclarativejsglobal_p.h"
+#include "private/qdeclarativejsgrammar_p.h"
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsengine_p.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Parser: protected $table
+{
+public:
+    union Value {
+      int ival;
+      double dval;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiParameterList *UiParameterList;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiArrayMemberList *UiArrayMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
+    };
+
+public:
+    Parser(Engine *engine);
+    ~Parser();
+
+    // parse a UI program
+    bool parse() { return parse(T_FEED_UI_PROGRAM); }
+    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
+    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
+    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
+
+    AST::UiProgram *ast() const
+    { return AST::cast<AST::UiProgram *>(program); }
+
+    AST::Statement *statement() const
+    {
+        if (! program)
+            return 0;
+
+        return program->statementCast();
+    }
+
+    AST::ExpressionNode *expression() const
+    {
+        if (! program)
+            return 0;
+
+        return program->expressionCast();
+    }
+
+    AST::UiObjectMember *uiObjectMember() const
+    {
+        if (! program)
+            return 0;
+
+        return program->uiObjectMemberCast();
+    }
+
+    AST::Node *rootNode() const
+    { return program; }
+
+    QList<DiagnosticMessage> diagnosticMessages() const
+    { return diagnostic_messages; }
+
+    inline DiagnosticMessage diagnosticMessage() const
+    {
+        foreach (const DiagnosticMessage &d, diagnostic_messages) {
+            if (! d.kind == DiagnosticMessage::Warning)
+                return d;
+        }
+
+        return DiagnosticMessage();
+    }
+
+    inline QString errorMessage() const
+    { return diagnosticMessage().message; }
+
+    inline int errorLineNumber() const
+    { return diagnosticMessage().loc.startLine; }
+
+    inline int errorColumnNumber() const
+    { return diagnosticMessage().loc.startColumn; }
+
+protected:
+    bool parse(int startToken);
+
+    void reallocateStack();
+
+    inline Value &sym(int index)
+    { return sym_stack [tos + index - 1]; }
+
+    inline AST::SourceLocation &loc(int index)
+    { return location_stack [tos + index - 1]; }
+
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
+protected:
+    Engine *driver;
+    int tos;
+    int stack_size;
+    Value *sym_stack;
+    int *state_stack;
+    AST::SourceLocation *location_stack;
+
+    AST::Node *program;
+
+    // error recovery
+    enum { TOKEN_BUFFER_SIZE = 3 };
+
+    struct SavedToken {
+       int token;
+       double dval;
+       AST::SourceLocation loc;
+    };
+
+    double yylval;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
+
+    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
+    SavedToken *first_token;
+    SavedToken *last_token;
+
+    QList<DiagnosticMessage> diagnostic_messages;
+};
+
+} // end of namespace QDeclarativeJS
+
+
+:/
+
+
+/.
+
+#include "private/qdeclarativejsparser_p.h"
+#include <QVarLengthArray>
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+using namespace QDeclarativeJS;
+
+QT_QML_BEGIN_NAMESPACE
+
+void Parser::reallocateStack()
+{
+    if (! stack_size)
+        stack_size = 128;
+    else
+        stack_size <<= 1;
+
+    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
+}
+
+inline static bool automatic(Engine *driver, int token)
+{
+    return token == $table::T_RBRACE
+        || token == 0
+        || driver->lexer()->prevTerminator();
+}
+
+
+Parser::Parser(Engine *engine):
+    driver(engine),
+    tos(0),
+    stack_size(0),
+    sym_stack(0),
+    state_stack(0),
+    location_stack(0),
+    first_token(0),
+    last_token(0)
+{
+}
+
+Parser::~Parser()
+{
+    if (stack_size) {
+        qFree(sym_stack);
+        qFree(state_stack);
+        qFree(location_stack);
+    }
+}
+
+static inline AST::SourceLocation location(Lexer *lexer)
+{
+    AST::SourceLocation loc;
+    loc.offset = lexer->tokenOffset();
+    loc.length = lexer->tokenLength();
+    loc.startLine = lexer->startLineNo();
+    loc.startColumn = lexer->startColumnNo();
+    return loc;
+}
+
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse(int startToken)
+{
+    Lexer *lexer = driver->lexer();
+    bool hadErrors = false;
+    int yytoken = -1;
+    int action = 0;
+
+    token_buffer[0].token = startToken;
+    first_token = &token_buffer[0];
+    last_token = &token_buffer[1];
+
+    tos = -1;
+    program = 0;
+
+    do {
+        if (++tos == stack_size)
+            reallocateStack();
+
+        state_stack[tos] = action;
+
+    _Lcheck_token:
+        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
+            yyprevlloc = yylloc;
+
+            if (first_token == last_token) {
+                yytoken = lexer->lex();
+                yylval = lexer->dval();
+                yylloc = location(lexer);
+            } else {
+                yytoken = first_token->token;
+                yylval = first_token->dval;
+                yylloc = first_token->loc;
+                ++first_token;
+            }
+        }
+
+        action = t_action(action, yytoken);
+        if (action > 0) {
+            if (action != ACCEPT_STATE) {
+                yytoken = -1;
+                sym(1).dval = yylval;
+                loc(1) = yylloc;
+            } else {
+              --tos;
+              return ! hadErrors;
+            }
+        } else if (action < 0) {
+          const int r = -action - 1;
+          tos -= rhs[r];
+
+          switch (r) {
+./
+
+--------------------------------------------------------------------------------------------------------
+-- Declarative UI
+--------------------------------------------------------------------------------------------------------
+
+TopLevel: T_FEED_UI_PROGRAM UiProgram ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_STATEMENT Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_EXPRESSION Expression ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_SOURCE_ELEMENT SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_UI_OBJECT_MEMBER UiObjectMember ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+TopLevel: T_FEED_JS_PROGRAM Program ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+./
+
+UiProgram: UiImportListOpt UiRootMember ;
+/.
+case $rule_number: {
+  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
+        sym(2).UiObjectMemberList->finish());
+} break;
+./
+
+UiImportListOpt: Empty ;
+UiImportListOpt: UiImportList ;
+/.
+case $rule_number: {
+    sym(1).Node = sym(1).UiImportList->finish();
+} break;
+./
+
+UiImportList: UiImport ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
+} break;
+./
+
+UiImportList: UiImportList UiImport ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
+        sym(1).UiImportList, sym(2).UiImport);
+} break;
+./
+
+ImportId: MemberExpression ;
+
+UiImport: UiImportHead T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->semicolonToken = loc(2);
+} break;
+./
+
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
+} break;
+./
+
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_NUMERIC_LITERAL T_AS JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
+    sym(1).UiImport->semicolonToken = loc(5);
+} break;
+./
+
+UiImport: UiImportHead T_AS JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiImport: UiImportHead T_AS JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
+    sym(1).UiImport->semicolonToken = loc(4);
+} break;
+./
+
+
+UiImportHead: T_IMPORT ImportId ;
+/.
+case $rule_number: {
+    AST::UiImport *node = 0;
+
+    if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), importIdLiteral->value);
+        node->fileNameToken = loc(2);
+    } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), qualifiedId);
+        node->fileNameToken = loc(2);
+    }
+
+    sym(1).Node = node;
+
+    if (node) {
+        node->importToken = loc(1);
+    } else {
+       diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+         QLatin1String("Expected a qualified name id or a string literal")));
+
+        return false; // ### remove me
+    }
+} break;
+./
+
+Empty: ;
+/.
+case $rule_number: {
+    sym(1).Node = 0;
+} break;
+./
+
+UiRootMember: UiObjectDefinition ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiObjectMemberList: UiObjectMember ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiObjectMemberList: UiObjectMemberList UiObjectMember ;
+/.
+case $rule_number: {
+    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
+    sym(1).Node = node;
+} break;
+./
+
+UiArrayMemberList: UiObjectDefinition ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+./
+
+UiArrayMemberList: UiArrayMemberList T_COMMA UiObjectDefinition ;
+/.
+case $rule_number: {
+    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
+        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
+    node->commaToken = loc(2);
+    sym(1).Node = node;
+} break;
+./
+
+UiObjectInitializer: T_LBRACE T_RBRACE ;
+/.
+case $rule_number: {
+    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
+    node->lbraceToken = loc(1);
+    node->rbraceToken = loc(2);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectInitializer: T_LBRACE UiObjectMemberList T_RBRACE ;
+/.
+case $rule_number: {
+    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
+    node->lbraceToken = loc(1);
+    node->rbraceToken = loc(3);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectDefinition: UiQualifiedId UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
+        sym(2).UiObjectInitializer);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: UiObjectDefinition ;
+
+UiObjectMember: UiQualifiedId T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
+/.
+case $rule_number: {
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
+    node->colonToken = loc(2);
+    node->lbracketToken = loc(3);
+    node->rbracketToken = loc(5);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: UiQualifiedId             T_COLON UiQualifiedId  UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+} break;
+./
+
+UiObjectMember: UiQualifiedId             T_ON UiQualifiedId  UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(3).UiQualifiedId, sym(1).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    node->hasOnToken = true;
+    sym(1).Node = node;
+} break;
+./
+
+UiObjectMember: UiQualifiedId T_COLON Block ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON EmptyStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ;
+/.case $rule_number:./
+
+UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding?
+/.case $rule_number:./
+
+/.
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(3).Statement);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+}   break;
+./
+
+UiPropertyType: T_VAR ;
+/.
+case $rule_number:
+./
+UiPropertyType: T_RESERVED_WORD ;
+/.
+case $rule_number: {
+    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    break;
+}
+./
+
+UiPropertyType: T_IDENTIFIER ;
+
+UiParameterListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+UiParameterListOpt: UiParameterList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+./
+
+UiParameterList: UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+  node->identifierToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+UiParameterList: UiParameterList T_COMMA UiPropertyType JsIdentifier ;
+/.
+case $rule_number: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
+  node->commaToken = loc(2);
+  node->identifierToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_LPAREN UiParameterListOpt T_RPAREN T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_SIGNAL T_IDENTIFIER T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
+        sym(5).Expression);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->colonToken = loc(4);
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_READONLY T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_AUTOMATIC_SEMICOLON ;
+UiObjectMember: T_DEFAULT T_PROPERTY UiPropertyType JsIdentifier T_COLON Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY T_IDENTIFIER T_LT UiPropertyType T_GT JsIdentifier T_COLON T_LBRACKET UiArrayMemberList T_RBRACKET ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), sym(6).sval);
+    propertyName->identifierToken = loc(6);
+    propertyName->next = 0;
+
+    AST::UiArrayBinding *binding = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        propertyName, sym(9).UiArrayMemberList->finish());
+    binding->colonToken = loc(7);
+    binding->lbracketToken = loc(8);
+    binding->rbracketToken = loc(10);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: T_PROPERTY UiPropertyType JsIdentifier T_COLON UiQualifiedId UiObjectInitializer ;
+/.
+case $rule_number: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), sym(3).sval);
+    propertyName->identifierToken = loc(3);
+    propertyName->next = 0;
+
+    AST::UiObjectBinding *binding = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      propertyName, sym(5).UiQualifiedId, sym(6).UiObjectInitializer);
+    binding->colonToken = loc(4);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
+}   break;
+./
+
+UiObjectMember: FunctionDeclaration ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+./
+
+UiObjectMember: VariableStatement ;
+/.
+case $rule_number: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+./
+
+JsIdentifier: T_IDENTIFIER;
+
+JsIdentifier: T_PROPERTY ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+JsIdentifier: T_SIGNAL ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+JsIdentifier: T_READONLY ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+JsIdentifier: T_ON ;
+/.
+case $rule_number: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_ON]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+./
+
+--------------------------------------------------------------------------------------------------------
+-- Expressions
+--------------------------------------------------------------------------------------------------------
+
+PrimaryExpression: T_THIS ;
+/.
+case $rule_number: {
+  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
+  node->thisToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: JsIdentifier ;
+/.
+case $rule_number: {
+  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_NULL ;
+/.
+case $rule_number: {
+  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
+  node->nullToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_TRUE ;
+/.
+case $rule_number: {
+  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
+  node->trueToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_FALSE ;
+/.
+case $rule_number: {
+  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
+  node->falseToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_NUMERIC_LITERAL ;
+/.
+case $rule_number: {
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_MULTILINE_STRING_LITERAL ;
+/.case $rule_number:./
+
+PrimaryExpression: T_STRING_LITERAL ;
+/.
+case $rule_number: {
+  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_DIVIDE_ ;
+/:
+#define J_SCRIPT_REGEXPLITERAL_RULE1 $rule_number
+:/
+/.
+case $rule_number: {
+  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false; // ### remove me
+  }
+
+  loc(1).length = lexer->tokenLength();
+
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_DIVIDE_EQ ;
+/:
+#define J_SCRIPT_REGEXPLITERAL_RULE2 $rule_number
+:/
+/.
+case $rule_number: {
+  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false;
+  }
+
+  loc(1).length = lexer->tokenLength();
+
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET Elision T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_COMMA T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACKET ElementList T_COMMA Elision T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+-- PrimaryExpression: T_LBRACE T_RBRACE ;
+-- /.
+-- case $rule_number: {
+--   sym(1).Node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+-- } break;
+-- ./
+
+PrimaryExpression: T_LBRACE PropertyNameAndValueListOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::ObjectLiteral *node = 0;
+  if (sym(2).Node)
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+        sym(2).PropertyNameAndValueList->finish ());
+  else
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LBRACE PropertyNameAndValueList T_COMMA T_RBRACE ;
+/.
+case $rule_number: {
+  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+    sym(2).PropertyNameAndValueList->finish ());
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PrimaryExpression: T_LPAREN Expression T_RPAREN ;
+/.
+case $rule_number: {
+  AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
+  node->lparenToken = loc(1);
+  node->rparenToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+UiQualifiedId: MemberExpression ;
+/.
+case $rule_number: {
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
+
+    sym(1).Expression = mem->base;
+  }
+
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
+    sym(1).UiQualifiedId = qualifiedId;
+  } else {
+    sym(1).UiQualifiedId = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+      QLatin1String("Expected a qualified name id")));
+
+    return false; // ### recover
+  }
+} break;
+./
+
+ElementList: AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
+} break;
+./
+
+ElementList: Elision AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
+} break;
+./
+
+ElementList: ElementList T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
+    (AST::Elision *) 0, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ElementList: ElementList T_COMMA Elision AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
+    sym(4).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+Elision: T_COMMA ;
+/.
+case $rule_number: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
+  node->commaToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+Elision: Elision T_COMMA ;
+/.
+case $rule_number: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyNameAndValueList: PropertyName T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyName, sym(3).Expression);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyNameAndValueList: PropertyNameAndValueList T_COMMA PropertyName T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
+  node->commaToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_IDENTIFIER %prec SHIFT_THERE ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_SIGNAL ;
+/.case $rule_number:./
+
+PropertyName: T_PROPERTY ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_STRING_LITERAL ;
+/.
+case $rule_number: {
+  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: T_NUMERIC_LITERAL ;
+/.
+case $rule_number: {
+  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+PropertyName: ReservedIdentifier ;
+/.
+case $rule_number: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+ReservedIdentifier: T_BREAK ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CASE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CATCH ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CONTINUE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DEFAULT ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DELETE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DO ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_ELSE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FALSE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FINALLY ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FOR ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_FUNCTION ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_IF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_IN ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_INSTANCEOF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_NEW ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_NULL ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_RETURN ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_SWITCH ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_THIS ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_THROW ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TRUE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TRY ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_TYPEOF ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_VAR ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_VOID ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_WHILE ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_CONST ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_DEBUGGER ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_RESERVED_WORD ;
+/.
+case $rule_number:
+./
+ReservedIdentifier: T_WITH ;
+/.
+case $rule_number:
+{
+  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+} break;
+./
+
+PropertyIdentifier: JsIdentifier ;
+PropertyIdentifier: ReservedIdentifier ;
+
+MemberExpression: PrimaryExpression ;
+MemberExpression: FunctionExpression ;
+
+MemberExpression: MemberExpression T_LBRACKET Expression T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->lbracketToken = loc(2);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+MemberExpression: MemberExpression T_DOT PropertyIdentifier ;
+/.
+case $rule_number: {
+  AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
+  node->dotToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+MemberExpression: T_NEW MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
+  node->newToken = loc(1);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+NewExpression: MemberExpression ;
+
+NewExpression: T_NEW NewExpression ;
+/.
+case $rule_number: {
+  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
+  node->newToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+CallExpression: MemberExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+CallExpression: CallExpression T_LPAREN ArgumentListOpt T_RPAREN ;
+/.
+case $rule_number: {
+  AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+CallExpression: CallExpression T_LBRACKET Expression T_RBRACKET ;
+/.
+case $rule_number: {
+  AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->lbracketToken = loc(2);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+CallExpression: CallExpression T_DOT PropertyIdentifier ;
+/.
+case $rule_number: {
+  AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
+  node->dotToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+ArgumentListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ArgumentListOpt: ArgumentList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).ArgumentList->finish();
+} break;
+./
+
+ArgumentList: AssignmentExpression ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
+} break;
+./
+
+ArgumentList: ArgumentList T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LeftHandSideExpression: NewExpression ;
+LeftHandSideExpression: CallExpression ;
+PostfixExpression: LeftHandSideExpression ;
+
+PostfixExpression: LeftHandSideExpression T_PLUS_PLUS ;
+/.
+case $rule_number: {
+  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->incrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+PostfixExpression: LeftHandSideExpression T_MINUS_MINUS ;
+/.
+case $rule_number: {
+  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->decrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: PostfixExpression ;
+
+UnaryExpression: T_DELETE UnaryExpression ;
+/.
+case $rule_number: {
+  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
+  node->deleteToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_VOID UnaryExpression ;
+/.
+case $rule_number: {
+  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
+  node->voidToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_TYPEOF UnaryExpression ;
+/.
+case $rule_number: {
+  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
+  node->typeofToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_PLUS_PLUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->incrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_MINUS_MINUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->decrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_PLUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
+  node->plusToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_MINUS UnaryExpression ;
+/.
+case $rule_number: {
+  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
+  node->minusToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_TILDE UnaryExpression ;
+/.
+case $rule_number: {
+  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
+  node->tildeToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+UnaryExpression: T_NOT UnaryExpression ;
+/.
+case $rule_number: {
+  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
+  node->notToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+MultiplicativeExpression: UnaryExpression ;
+
+MultiplicativeExpression: MultiplicativeExpression T_STAR UnaryExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Mul, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+MultiplicativeExpression: MultiplicativeExpression T_DIVIDE_ UnaryExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Div, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+MultiplicativeExpression: MultiplicativeExpression T_REMAINDER UnaryExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Mod, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+AdditiveExpression: MultiplicativeExpression ;
+
+AdditiveExpression: AdditiveExpression T_PLUS MultiplicativeExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Add, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+AdditiveExpression: AdditiveExpression T_MINUS MultiplicativeExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Sub, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ShiftExpression: AdditiveExpression ;
+
+ShiftExpression: ShiftExpression T_LT_LT AdditiveExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::LShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ShiftExpression: ShiftExpression T_GT_GT AdditiveExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::RShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ShiftExpression: ShiftExpression T_GT_GT_GT AdditiveExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::URShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: ShiftExpression ;
+
+RelationalExpression: RelationalExpression T_LT ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Lt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: RelationalExpression T_GT ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Gt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: RelationalExpression T_LE ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Le, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: RelationalExpression T_GE ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Ge, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: RelationalExpression T_INSTANCEOF ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::InstanceOf, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpression: RelationalExpression T_IN ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::In, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpressionNotIn: ShiftExpression ;
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_LT ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Lt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_GT ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Gt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_LE ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Le, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_GE ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+   QSOperator::Ge, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+RelationalExpressionNotIn: RelationalExpressionNotIn T_INSTANCEOF ShiftExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::InstanceOf, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpression: RelationalExpression ;
+
+EqualityExpression: EqualityExpression T_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Equal, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpression: EqualityExpression T_NOT_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::NotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpression: EqualityExpression T_EQ_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpression: EqualityExpression T_NOT_EQ_EQ RelationalExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictNotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpressionNotIn: RelationalExpressionNotIn ;
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Equal, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ RelationalExpressionNotIn;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::NotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_EQ_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+EqualityExpressionNotIn: EqualityExpressionNotIn T_NOT_EQ_EQ RelationalExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictNotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseANDExpression: EqualityExpression ;
+
+BitwiseANDExpression: BitwiseANDExpression T_AND EqualityExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitAnd, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseANDExpressionNotIn: EqualityExpressionNotIn ;
+
+BitwiseANDExpressionNotIn: BitwiseANDExpressionNotIn T_AND EqualityExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitAnd, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseXORExpression: BitwiseANDExpression ;
+
+BitwiseXORExpression: BitwiseXORExpression T_XOR BitwiseANDExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitXor, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseXORExpressionNotIn: BitwiseANDExpressionNotIn ;
+
+BitwiseXORExpressionNotIn: BitwiseXORExpressionNotIn T_XOR BitwiseANDExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitXor, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseORExpression: BitwiseXORExpression ;
+
+BitwiseORExpression: BitwiseORExpression T_OR BitwiseXORExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitOr, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BitwiseORExpressionNotIn: BitwiseXORExpressionNotIn ;
+
+BitwiseORExpressionNotIn: BitwiseORExpressionNotIn T_OR BitwiseXORExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitOr, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LogicalANDExpression: BitwiseORExpression ;
+
+LogicalANDExpression: LogicalANDExpression T_AND_AND BitwiseORExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::And, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LogicalANDExpressionNotIn: BitwiseORExpressionNotIn ;
+
+LogicalANDExpressionNotIn: LogicalANDExpressionNotIn T_AND_AND BitwiseORExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::And, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LogicalORExpression: LogicalANDExpression ;
+
+LogicalORExpression: LogicalORExpression T_OR_OR LogicalANDExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Or, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LogicalORExpressionNotIn: LogicalANDExpressionNotIn ;
+
+LogicalORExpressionNotIn: LogicalORExpressionNotIn T_OR_OR LogicalANDExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Or, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ConditionalExpression: LogicalORExpression ;
+
+ConditionalExpression: LogicalORExpression T_QUESTION AssignmentExpression T_COLON AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+ConditionalExpressionNotIn: LogicalORExpressionNotIn ;
+
+ConditionalExpressionNotIn: LogicalORExpressionNotIn T_QUESTION AssignmentExpressionNotIn T_COLON AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+AssignmentExpression: ConditionalExpression ;
+
+AssignmentExpression: LeftHandSideExpression AssignmentOperator AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    sym(2).ival, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+AssignmentExpressionNotIn: ConditionalExpressionNotIn ;
+
+AssignmentExpressionNotIn: LeftHandSideExpression AssignmentOperator AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    sym(2).ival, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+AssignmentOperator: T_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::Assign;
+} break;
+./
+
+AssignmentOperator: T_STAR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceMul;
+} break;
+./
+
+AssignmentOperator: T_DIVIDE_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceDiv;
+} break;
+./
+
+AssignmentOperator: T_REMAINDER_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceMod;
+} break;
+./
+
+AssignmentOperator: T_PLUS_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceAdd;
+} break;
+./
+
+AssignmentOperator: T_MINUS_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceSub;
+} break;
+./
+
+AssignmentOperator: T_LT_LT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceLeftShift;
+} break;
+./
+
+AssignmentOperator: T_GT_GT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceRightShift;
+} break;
+./
+
+AssignmentOperator: T_GT_GT_GT_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceURightShift;
+} break;
+./
+
+AssignmentOperator: T_AND_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceAnd;
+} break;
+./
+
+AssignmentOperator: T_XOR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceXor;
+} break;
+./
+
+AssignmentOperator: T_OR_EQ ;
+/.
+case $rule_number: {
+  sym(1).ival = QSOperator::InplaceOr;
+} break;
+./
+
+Expression: AssignmentExpression ;
+
+Expression: Expression T_COMMA AssignmentExpression ;
+/.
+case $rule_number: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ExpressionOpt: Expression ;
+
+ExpressionNotIn: AssignmentExpressionNotIn ;
+
+ExpressionNotIn: ExpressionNotIn T_COMMA AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionNotInOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+ExpressionNotInOpt: ExpressionNotIn ;
+
+Statement: Block ;
+Statement: VariableStatement ;
+Statement: EmptyStatement ;
+Statement: ExpressionStatement ;
+Statement: IfStatement ;
+Statement: IterationStatement ;
+Statement: ContinueStatement ;
+Statement: BreakStatement ;
+Statement: ReturnStatement ;
+Statement: WithStatement ;
+Statement: LabelledStatement ;
+Statement: SwitchStatement ;
+Statement: ThrowStatement ;
+Statement: TryStatement ;
+Statement: DebuggerStatement ;
+
+
+Block: T_LBRACE StatementListOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+StatementList: Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
+} break;
+./
+
+StatementList: StatementList Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
+} break;
+./
+
+StatementListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+StatementListOpt: StatementList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).StatementList->finish ();
+} break;
+./
+
+VariableStatement: VariableDeclarationKind VariableDeclarationList T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+VariableStatement: VariableDeclarationKind VariableDeclarationList T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
+     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
+  node->declarationKindToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationKind: T_CONST ;
+/.
+case $rule_number: {
+  sym(1).ival = T_CONST;
+} break;
+./
+
+VariableDeclarationKind: T_VAR ;
+/.
+case $rule_number: {
+  sym(1).ival = T_VAR;
+} break;
+./
+
+VariableDeclarationList: VariableDeclaration ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+./
+
+VariableDeclarationList: VariableDeclarationList T_COMMA VariableDeclaration ;
+/.
+case $rule_number: {
+  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
+    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationListNotIn: VariableDeclarationNotIn ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+./
+
+VariableDeclarationListNotIn: VariableDeclarationListNotIn T_COMMA VariableDeclarationNotIn ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+} break;
+./
+
+VariableDeclaration: JsIdentifier InitialiserOpt ;
+/.
+case $rule_number: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+VariableDeclarationNotIn: JsIdentifier InitialiserNotInOpt ;
+/.
+case $rule_number: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+Initialiser: T_EQ AssignmentExpression ;
+/.
+case $rule_number: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+./
+
+InitialiserOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+InitialiserOpt: Initialiser ;
+
+InitialiserNotIn: T_EQ AssignmentExpressionNotIn ;
+/.
+case $rule_number: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+./
+
+InitialiserNotInOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+InitialiserNotInOpt: InitialiserNotIn ;
+
+EmptyStatement: T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
+  node->semicolonToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+ExpressionStatement: Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ExpressionStatement: Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement T_ELSE Statement ;
+/.
+case $rule_number: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  node->elseToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+IfStatement: T_IF T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+
+IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+IterationStatement: T_DO Statement T_WHILE T_LPAREN Expression T_RPAREN T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
+  node->doToken = loc(1);
+  node->whileToken = loc(3);
+  node->lparenToken = loc(4);
+  node->rparenToken = loc(6);
+  node->semicolonToken = loc(7);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_WHILE T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->whileToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN ExpressionNotInOpt T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Expression, sym(9).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->firstSemicolonToken = loc(4);
+  node->secondSemicolonToken = loc(6);
+  node->rparenToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationListNotIn T_SEMICOLON ExpressionOpt T_SEMICOLON ExpressionOpt T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
+     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
+     sym(8).Expression, sym(10).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->firstSemicolonToken = loc(5);
+  node->secondSemicolonToken = loc(7);
+  node->rparenToken = loc(9);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN LeftHandSideExpression T_IN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->inToken = loc(4);
+  node->rparenToken = loc(6);
+  sym(1).Node = node;
+} break;
+./
+
+IterationStatement: T_FOR T_LPAREN T_VAR VariableDeclarationNotIn T_IN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
+    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->inToken = loc(5);
+  node->rparenToken = loc(7);
+  sym(1).Node = node;
+} break;
+./
+
+ContinueStatement: T_CONTINUE T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ContinueStatement: T_CONTINUE T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
+  node->continueToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ContinueStatement: T_CONTINUE JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ContinueStatement: T_CONTINUE JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
+  node->continueToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+BreakStatement: T_BREAK T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+BreakStatement: T_BREAK T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
+  node->breakToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+BreakStatement: T_BREAK JsIdentifier T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+BreakStatement: T_BREAK JsIdentifier T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
+  node->breakToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+ReturnStatement: T_RETURN ExpressionOpt T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ReturnStatement: T_RETURN ExpressionOpt T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
+  node->returnToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+WithStatement: T_WITH T_LPAREN Expression T_RPAREN Statement ;
+/.
+case $rule_number: {
+  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->withToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+SwitchStatement: T_SWITCH T_LPAREN Expression T_RPAREN CaseBlock ;
+/.
+case $rule_number: {
+  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
+  node->switchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+CaseBlock: T_LBRACE CaseClausesOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+CaseBlock: T_LBRACE CaseClausesOpt DefaultClause CaseClausesOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(5);
+  sym(1).Node = node;
+} break;
+./
+
+CaseClauses: CaseClause ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
+} break;
+./
+
+CaseClauses: CaseClauses CaseClause ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
+} break;
+./
+
+CaseClausesOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+CaseClausesOpt: CaseClauses ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).CaseClauses->finish ();
+} break;
+./
+
+CaseClause: T_CASE Expression T_COLON StatementListOpt ;
+/.
+case $rule_number: {
+  AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
+  node->caseToken = loc(1);
+  node->colonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+DefaultClause: T_DEFAULT T_COLON StatementListOpt ;
+/.
+case $rule_number: {
+  AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
+  node->defaultToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LabelledStatement: T_SIGNAL T_COLON Statement ;
+/.case $rule_number:./
+
+LabelledStatement: T_PROPERTY T_COLON Statement ;
+/.
+case $rule_number: {
+  AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
+  node->identifierToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+LabelledStatement: T_IDENTIFIER T_COLON Statement ;
+/.
+case $rule_number: {
+  AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
+  node->identifierToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+ThrowStatement: T_THROW Expression T_AUTOMATIC_SEMICOLON ;  -- automatic semicolon
+ThrowStatement: T_THROW Expression T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
+  node->throwToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Catch ;
+/.
+case $rule_number: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Finally ;
+/.
+case $rule_number: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+TryStatement: T_TRY Block Catch Finally ;
+/.
+case $rule_number: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+Catch: T_CATCH T_LPAREN JsIdentifier T_RPAREN Block ;
+/.
+case $rule_number: {
+  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
+  node->catchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->identifierToken = loc(3);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+./
+
+Finally: T_FINALLY Block ;
+/.
+case $rule_number: {
+  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
+  node->finallyToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+DebuggerStatement: T_DEBUGGER T_AUTOMATIC_SEMICOLON ; -- automatic semicolon
+DebuggerStatement: T_DEBUGGER T_SEMICOLON ;
+/.
+case $rule_number: {
+  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
+  node->debuggerToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+./
+
+FunctionDeclaration: T_FUNCTION JsIdentifier T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
+  node->functionToken = loc(1);
+  node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+FunctionExpression: T_FUNCTION IdentifierOpt T_LPAREN FormalParameterListOpt T_RPAREN T_LBRACE FunctionBodyOpt T_RBRACE ;
+/.
+case $rule_number: {
+  AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
+  node->functionToken = loc(1);
+  if (sym(2).sval)
+      node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+./
+
+FormalParameterList: JsIdentifier ;
+/.
+case $rule_number: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+./
+
+FormalParameterList: FormalParameterList T_COMMA JsIdentifier ;
+/.
+case $rule_number: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
+  node->commaToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+./
+
+FormalParameterListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+FormalParameterListOpt: FormalParameterList ;
+/.
+case $rule_number: {
+  sym(1).Node = sym(1).FormalParameterList->finish ();
+} break;
+./
+
+FunctionBodyOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+FunctionBodyOpt: FunctionBody ;
+
+FunctionBody: SourceElements ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+./
+
+Program: SourceElements ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+./
+
+SourceElements: SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
+} break;
+./
+
+SourceElements: SourceElements SourceElement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
+} break;
+./
+
+SourceElement: Statement ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
+} break;
+./
+
+SourceElement: FunctionDeclaration ;
+/.
+case $rule_number: {
+  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
+} break;
+./
+
+IdentifierOpt: ;
+/.
+case $rule_number: {
+  sym(1).sval = 0;
+} break;
+./
+
+IdentifierOpt: JsIdentifier ;
+
+PropertyNameAndValueListOpt: ;
+/.
+case $rule_number: {
+  sym(1).Node = 0;
+} break;
+./
+
+PropertyNameAndValueListOpt: PropertyNameAndValueList ;
+
+/.
+            } // switch
+            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
+        } // if
+    } while (action != 0);
+
+    if (first_token == last_token) {
+        const int errorState = state_stack[tos];
+
+        // automatic insertion of `;'
+        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+            SavedToken &tk = token_buffer[0];
+            tk.token = yytoken;
+            tk.dval = yylval;
+            tk.loc = yylloc;
+
+            yylloc = yyprevlloc;
+            yylloc.offset += yylloc.length;
+            yylloc.startColumn += yylloc.length;
+            yylloc.length = 0;
+
+            //const QString msg = qApp->translate("QDeclarativeParser", "Missing `;'");
+            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
+
+            first_token = &token_buffer[0];
+            last_token = &token_buffer[1];
+
+            yytoken = T_SEMICOLON;
+            yylval = 0;
+
+            action = errorState;
+
+            goto _Lcheck_token;
+        }
+
+        hadErrors = true;
+
+        token_buffer[0].token = yytoken;
+        token_buffer[0].dval = yylval;
+        token_buffer[0].loc = yylloc;
+
+        token_buffer[1].token = yytoken = lexer->lex();
+        token_buffer[1].dval  = yylval  = lexer->dval();
+        token_buffer[1].loc   = yylloc  = location(lexer);
+
+        if (t_action(errorState, yytoken)) {
+            QString msg;
+            int token = token_buffer[0].token;
+            if (token < 0 || token >= TERMINAL_COUNT)
+                msg = qApp->translate("QDeclarativeParser", "Syntax error");
+            else
+                msg = qApp->translate("QDeclarativeParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
+            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+            action = errorState;
+            goto _Lcheck_token;
+        }
+
+        static int tokens[] = {
+            T_PLUS,
+            T_EQ,
+
+            T_COMMA,
+            T_COLON,
+            T_SEMICOLON,
+
+            T_RPAREN, T_RBRACKET, T_RBRACE,
+
+            T_NUMERIC_LITERAL,
+            T_IDENTIFIER,
+
+            T_LPAREN, T_LBRACKET, T_LBRACE,
+
+            EOF_SYMBOL
+        };
+
+        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
+            int a = t_action(errorState, *tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = *tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                first_token = &token_buffer[0];
+                last_token = &token_buffer[2];
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
+            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
+               continue;
+
+            int a = t_action(errorState, tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        const QString msg = qApp->translate("QDeclarativeParser", "Syntax error");
+        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+    }
+
+    return false;
+}
+
+QT_QML_END_NAMESPACE
+
+
+./
+/:
+QT_QML_END_NAMESPACE
+
+
+
+#endif // QDECLARATIVEJSPARSER_P_H
+:/
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsast.cpp b/tools/qdoc3/declarativeparser/qdeclarativejsast.cpp
new file mode 100644
index 0000000..e59ffd7
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsast.cpp
@@ -0,0 +1,956 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsast_p.h"
+
+#include "qdeclarativejsastvisitor_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+void Node::accept(Visitor *visitor)
+{
+    if (visitor->preVisit(this)) {
+        accept0(visitor);
+    }
+    visitor->postVisit(this);
+}
+
+void Node::accept(Node *node, Visitor *visitor)
+{
+    if (node)
+        node->accept(visitor);
+}
+
+ExpressionNode *Node::expressionCast()
+{
+    return 0;
+}
+
+BinaryExpression *Node::binaryExpressionCast()
+{
+    return 0;
+}
+
+Statement *Node::statementCast()
+{
+    return 0;
+}
+
+UiObjectMember *Node::uiObjectMemberCast()
+{
+    return 0;
+}
+
+ExpressionNode *ExpressionNode::expressionCast()
+{
+    return this;
+}
+
+BinaryExpression *BinaryExpression::binaryExpressionCast()
+{
+    return this;
+}
+
+Statement *Statement::statementCast()
+{
+    return this;
+}
+
+UiObjectMember *UiObjectMember::uiObjectMemberCast()
+{
+    return this;
+}
+
+void NestedExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+    visitor->endVisit(this);
+}
+
+void ThisExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void IdentifierExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NullExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void TrueLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void FalseLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void StringLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NumericLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void RegExpLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArrayLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+        accept(elision, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ObjectLiteral::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(properties, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ElementList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (ElementList *it = this; it; it = it->next) {
+            accept(it->elision, visitor);
+            accept(it->expression, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void Elision::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        // ###
+    }
+
+    visitor->endVisit(this);
+}
+
+void PropertyNameAndValueList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (PropertyNameAndValueList *it = this; it; it = it->next) {
+            accept(it->name, visitor);
+            accept(it->value, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void IdentifierPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void StringLiteralPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void NumericLiteralPropertyName::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArrayMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FieldMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NewMemberExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(arguments, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NewExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CallExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+        accept(arguments, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ArgumentList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (ArgumentList *it = this; it; it = it->next) {
+            accept(it->expression, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void PostIncrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PostDecrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(base, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DeleteExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void VoidExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TypeOfExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PreIncrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void PreDecrementExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UnaryPlusExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UnaryMinusExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TildeExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void NotExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void BinaryExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(left, visitor);
+        accept(right, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ConditionalExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(ok, visitor);
+        accept(ko, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Expression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(left, visitor);
+        accept(right, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Block::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void StatementList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (StatementList *it = this; it; it = it->next) {
+            accept(it->statement, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declarations, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableDeclarationList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (VariableDeclarationList *it = this; it; it = it->next) {
+            accept(it->declaration, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void VariableDeclaration::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void EmptyStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ExpressionStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void IfStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(ok, visitor);
+        accept(ko, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DoWhileStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void WhileStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ForStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(initialiser, visitor);
+        accept(condition, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LocalForStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declarations, visitor);
+        accept(condition, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ForEachStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(initialiser, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LocalForEachStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declaration, visitor);
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ContinueStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void BreakStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void ReturnStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void WithStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void SwitchStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(block, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseBlock::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(clauses, visitor);
+        accept(defaultClause, visitor);
+        accept(moreClauses, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseClauses::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (CaseClauses *it = this; it; it = it->next) {
+            accept(it->clause, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void CaseClause::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DefaultClause::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void LabelledStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void ThrowStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void TryStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+        accept(catchExpression, visitor);
+        accept(finallyExpression, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Catch::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Finally::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionDeclaration::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+        accept(body, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionExpression::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+        accept(body, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void FormalParameterList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        // ###
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionBody::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void Program::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(elements, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void SourceElements::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (SourceElements *it = this; it; it = it->next) {
+            accept(it->element, visitor);
+        }
+    }
+
+    visitor->endVisit(this);
+}
+
+void FunctionSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(declaration, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void StatementSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void DebuggerStatement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiProgram::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(imports, visitor);
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiSignature::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(formals, visitor);
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormalList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiFormalList *it = this; it; it = it->next) {
+            accept(it->formal, visitor);
+        }
+    }
+    visitor->endVisit(this);
+}
+
+void UiFormal::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+    visitor->endVisit(this);
+}
+
+void UiPublicMember::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(expression, visitor);
+        accept(binding, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectDefinition::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedTypeNameId, visitor);
+        accept(initializer, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectInitializer::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(qualifiedTypeNameId, visitor);
+        accept(initializer, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiScriptBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(statement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiArrayBinding::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(qualifiedId, visitor);
+        accept(members, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiObjectMemberList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiObjectMemberList *it = this; it; it = it->next)
+            accept(it->member, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiArrayMemberList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        for (UiArrayMemberList *it = this; it; it = it->next)
+            accept(it->member, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiQualifiedId::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiImport::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(importUri, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiImportList::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(import, visitor);
+        accept(next, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+void UiSourceElement::accept0(Visitor *visitor)
+{
+    if (visitor->visit(this)) {
+        accept(sourceElement, visitor);
+    }
+
+    visitor->endVisit(this);
+}
+
+} } // namespace QDeclarativeJS::AST
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsast_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsast_p.h
new file mode 100644
index 0000000..cd41187
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsast_p.h
@@ -0,0 +1,2546 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSAST_P_H
+#define QDECLARATIVEJSAST_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsastvisitor_p.h"
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+#define QDECLARATIVEJS_DECLARE_AST_NODE(name) \
+  enum { K = Kind_##name };
+
+namespace QSOperator // ### rename
+{
+
+enum Op {
+    Add,
+    And,
+    InplaceAnd,
+    Assign,
+    BitAnd,
+    BitOr,
+    BitXor,
+    InplaceSub,
+    Div,
+    InplaceDiv,
+    Equal,
+    Ge,
+    Gt,
+    In,
+    InplaceAdd,
+    InstanceOf,
+    Le,
+    LShift,
+    InplaceLeftShift,
+    Lt,
+    Mod,
+    InplaceMod,
+    Mul,
+    InplaceMul,
+    NotEqual,
+    Or,
+    InplaceOr,
+    RShift,
+    InplaceRightShift,
+    StrictEqual,
+    StrictNotEqual,
+    Sub,
+    URShift,
+    InplaceURightShift,
+    InplaceXor
+};
+
+} // namespace QSOperator
+
+namespace QDeclarativeJS {
+class NameId;
+namespace AST {
+
+template <typename _T1, typename _T2>
+_T1 cast(_T2 *ast)
+{
+    if (ast && ast->kind == static_cast<_T1>(0)->K)
+        return static_cast<_T1>(ast);
+
+    return 0;
+}
+
+class QML_PARSER_EXPORT Node
+{
+public:
+    enum Kind {
+        Kind_Undefined,
+
+        Kind_ArgumentList,
+        Kind_ArrayLiteral,
+        Kind_ArrayMemberExpression,
+        Kind_BinaryExpression,
+        Kind_Block,
+        Kind_BreakStatement,
+        Kind_CallExpression,
+        Kind_CaseBlock,
+        Kind_CaseClause,
+        Kind_CaseClauses,
+        Kind_Catch,
+        Kind_ConditionalExpression,
+        Kind_ContinueStatement,
+        Kind_DebuggerStatement,
+        Kind_DefaultClause,
+        Kind_DeleteExpression,
+        Kind_DoWhileStatement,
+        Kind_ElementList,
+        Kind_Elision,
+        Kind_EmptyStatement,
+        Kind_Expression,
+        Kind_ExpressionStatement,
+        Kind_FalseLiteral,
+        Kind_FieldMemberExpression,
+        Kind_Finally,
+        Kind_ForEachStatement,
+        Kind_ForStatement,
+        Kind_FormalParameterList,
+        Kind_FunctionBody,
+        Kind_FunctionDeclaration,
+        Kind_FunctionExpression,
+        Kind_FunctionSourceElement,
+        Kind_IdentifierExpression,
+        Kind_IdentifierPropertyName,
+        Kind_IfStatement,
+        Kind_LabelledStatement,
+        Kind_LocalForEachStatement,
+        Kind_LocalForStatement,
+        Kind_NewExpression,
+        Kind_NewMemberExpression,
+        Kind_NotExpression,
+        Kind_NullExpression,
+        Kind_NumericLiteral,
+        Kind_NumericLiteralPropertyName,
+        Kind_ObjectLiteral,
+        Kind_PostDecrementExpression,
+        Kind_PostIncrementExpression,
+        Kind_PreDecrementExpression,
+        Kind_PreIncrementExpression,
+        Kind_Program,
+        Kind_PropertyName,
+        Kind_PropertyNameAndValueList,
+        Kind_RegExpLiteral,
+        Kind_ReturnStatement,
+        Kind_SourceElement,
+        Kind_SourceElements,
+        Kind_StatementList,
+        Kind_StatementSourceElement,
+        Kind_StringLiteral,
+        Kind_StringLiteralPropertyName,
+        Kind_SwitchStatement,
+        Kind_ThisExpression,
+        Kind_ThrowStatement,
+        Kind_TildeExpression,
+        Kind_TrueLiteral,
+        Kind_TryStatement,
+        Kind_TypeOfExpression,
+        Kind_UnaryMinusExpression,
+        Kind_UnaryPlusExpression,
+        Kind_VariableDeclaration,
+        Kind_VariableDeclarationList,
+        Kind_VariableStatement,
+        Kind_VoidExpression,
+        Kind_WhileStatement,
+        Kind_WithStatement,
+        Kind_NestedExpression,
+
+        Kind_UiArrayBinding,
+        Kind_UiImport,
+        Kind_UiImportList,
+        Kind_UiObjectBinding,
+        Kind_UiObjectDefinition,
+        Kind_UiObjectInitializer,
+        Kind_UiObjectMemberList,
+        Kind_UiArrayMemberList,
+        Kind_UiProgram,
+        Kind_UiParameterList,
+        Kind_UiPublicMember,
+        Kind_UiQualifiedId,
+        Kind_UiScriptBinding,
+        Kind_UiSourceElement,
+        Kind_UiFormal,
+        Kind_UiFormalList,
+        Kind_UiSignature
+    };
+
+    inline Node()
+        : kind(Kind_Undefined) {}
+
+    // NOTE: node destructors are never called,
+    //       instead we block free the memory
+    //       (see the NodePool class)
+    virtual ~Node() {}
+
+    virtual ExpressionNode *expressionCast();
+    virtual BinaryExpression *binaryExpressionCast();
+    virtual Statement *statementCast();
+    virtual UiObjectMember *uiObjectMemberCast();
+
+    void accept(Visitor *visitor);
+    static void accept(Node *node, Visitor *visitor);
+
+    inline static void acceptChild(Node *node, Visitor *visitor)
+    { return accept(node, visitor); } // ### remove
+
+    virtual void accept0(Visitor *visitor) = 0;
+
+// attributes
+    int kind;
+};
+
+class QML_PARSER_EXPORT ExpressionNode: public Node
+{
+public:
+    ExpressionNode() {}
+
+    virtual ExpressionNode *expressionCast();
+
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+};
+
+class QML_PARSER_EXPORT Statement: public Node
+{
+public:
+    Statement() {}
+
+    virtual Statement *statementCast();
+
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+};
+
+class QML_PARSER_EXPORT UiFormal: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiFormal)
+
+    UiFormal(NameId *name, NameId *alias = 0)
+      : name(name), alias(alias)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    NameId *alias;
+    SourceLocation identifierToken;
+    SourceLocation asToken;
+    SourceLocation aliasToken;
+};
+
+class QML_PARSER_EXPORT UiFormalList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiFormalList)
+
+    UiFormalList(UiFormal *formal)
+            : formal(formal), next(this) {}
+
+    UiFormalList(UiFormalList *previous, UiFormal *formal)
+            : formal(formal)
+    {
+        next = previous->next;
+        previous->next = this;
+    }
+
+    UiFormalList *finish()
+    {
+        UiFormalList *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiFormal *formal;
+    UiFormalList *next;
+};
+
+class QML_PARSER_EXPORT UiSignature: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiSignature)
+
+    UiSignature(UiFormalList *formals = 0)
+        : formals(formals)
+    { }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return SourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceLocation lparenToken;
+    UiFormalList *formals;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NestedExpression)
+
+    NestedExpression(ExpressionNode *expression)
+        : expression(expression)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lparenToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ThisExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ThisExpression)
+
+    ThisExpression() { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return thisToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return thisToken; }
+
+// attributes
+    SourceLocation thisToken;
+};
+
+class QML_PARSER_EXPORT IdentifierExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IdentifierExpression)
+
+    IdentifierExpression(NameId *n):
+        name (n) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return identifierToken; }
+
+// attributes
+    NameId *name;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT NullExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NullExpression)
+
+    NullExpression() { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return nullToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return nullToken; }
+
+// attributes
+    SourceLocation nullToken;
+};
+
+class QML_PARSER_EXPORT TrueLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TrueLiteral)
+
+    TrueLiteral() { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return trueToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return trueToken; }
+
+// attributes
+    SourceLocation trueToken;
+};
+
+class QML_PARSER_EXPORT FalseLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FalseLiteral)
+
+    FalseLiteral() { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return falseToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return falseToken; }
+
+// attributes
+    SourceLocation falseToken;
+};
+
+class QML_PARSER_EXPORT NumericLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NumericLiteral)
+
+    NumericLiteral(double v):
+        value(v) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    double value;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT StringLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StringLiteral)
+
+    StringLiteral(NameId *v):
+        value (v) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    NameId *value;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT RegExpLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(RegExpLiteral)
+
+    RegExpLiteral(NameId *p, int f):
+        pattern (p), flags (f) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return literalToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return literalToken; }
+
+// attributes:
+    NameId *pattern;
+    int flags;
+    SourceLocation literalToken;
+};
+
+class QML_PARSER_EXPORT ArrayLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArrayLiteral)
+
+    ArrayLiteral(Elision *e):
+        elements (0), elision (e)
+        { kind = K; }
+
+    ArrayLiteral(ElementList *elts):
+        elements (elts), elision (0)
+        { kind = K; }
+
+    ArrayLiteral(ElementList *elts, Elision *e):
+        elements (elts), elision (e)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbracketToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+// attributes
+    ElementList *elements;
+    Elision *elision;
+    SourceLocation lbracketToken;
+    SourceLocation commaToken;
+    SourceLocation rbracketToken;
+};
+
+class QML_PARSER_EXPORT ObjectLiteral: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ObjectLiteral)
+
+    ObjectLiteral():
+        properties (0) { kind = K; }
+
+    ObjectLiteral(PropertyNameAndValueList *plist):
+        properties (plist) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbraceToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+// attributes
+    PropertyNameAndValueList *properties;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT ElementList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ElementList)
+
+    ElementList(Elision *e, ExpressionNode *expr):
+        elision (e), expression (expr), next (this)
+    { kind = K; }
+
+    ElementList(ElementList *previous, Elision *e, ExpressionNode *expr):
+        elision (e), expression (expr)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    inline ElementList *finish ()
+    {
+        ElementList *front = next;
+        next = 0;
+        return front;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Elision *elision;
+    ExpressionNode *expression;
+    ElementList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT Elision: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Elision)
+
+    Elision():
+        next (this) { kind = K; }
+
+    Elision(Elision *previous)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline Elision *finish ()
+    {
+        Elision *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    Elision *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PropertyNameAndValueList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PropertyNameAndValueList)
+
+    PropertyNameAndValueList(PropertyName *n, ExpressionNode *v):
+        name (n), value (v), next (this)
+        { kind = K; }
+
+    PropertyNameAndValueList(PropertyNameAndValueList *previous, PropertyName *n, ExpressionNode *v):
+        name (n), value (v)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline PropertyNameAndValueList *finish ()
+    {
+        PropertyNameAndValueList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    PropertyName *name;
+    ExpressionNode *value;
+    PropertyNameAndValueList *next;
+    SourceLocation colonToken;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PropertyName: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PropertyName)
+
+    PropertyName() { kind = K; }
+
+// attributes
+    SourceLocation propertyNameToken;
+};
+
+class QML_PARSER_EXPORT IdentifierPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IdentifierPropertyName)
+
+    IdentifierPropertyName(NameId *n):
+        id (n) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *id;
+};
+
+class QML_PARSER_EXPORT StringLiteralPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StringLiteralPropertyName)
+
+    StringLiteralPropertyName(NameId *n):
+        id (n) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *id;
+};
+
+class QML_PARSER_EXPORT NumericLiteralPropertyName: public PropertyName
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NumericLiteralPropertyName)
+
+    NumericLiteralPropertyName(double n):
+        id (n) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    double id;
+};
+
+class QML_PARSER_EXPORT ArrayMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArrayMemberExpression)
+
+    ArrayMemberExpression(ExpressionNode *b, ExpressionNode *e):
+        base (b), expression (e)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+// attributes
+    ExpressionNode *base;
+    ExpressionNode *expression;
+    SourceLocation lbracketToken;
+    SourceLocation rbracketToken;
+};
+
+class QML_PARSER_EXPORT FieldMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FieldMemberExpression)
+
+    FieldMemberExpression(ExpressionNode *b, NameId *n):
+        base (b), name (n)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return identifierToken; }
+
+    // attributes
+    ExpressionNode *base;
+    NameId *name;
+    SourceLocation dotToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT NewMemberExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NewMemberExpression)
+
+    NewMemberExpression(ExpressionNode *b, ArgumentList *a):
+        base (b), arguments (a)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return newToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+    // attributes
+    ExpressionNode *base;
+    ArgumentList *arguments;
+    SourceLocation newToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT NewExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NewExpression)
+
+    NewExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return newToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation newToken;
+};
+
+class QML_PARSER_EXPORT CallExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CallExpression)
+
+    CallExpression(ExpressionNode *b, ArgumentList *a):
+        base (b), arguments (a)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rparenToken; }
+
+// attributes
+    ExpressionNode *base;
+    ArgumentList *arguments;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ArgumentList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ArgumentList)
+
+    ArgumentList(ExpressionNode *e):
+        expression (e), next (this)
+        { kind = K; }
+
+    ArgumentList(ArgumentList *previous, ExpressionNode *e):
+        expression (e)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline ArgumentList *finish ()
+    {
+        ArgumentList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    ExpressionNode *expression;
+    ArgumentList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT PostIncrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PostIncrementExpression)
+
+    PostIncrementExpression(ExpressionNode *b):
+        base (b) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return incrementToken; }
+
+// attributes
+    ExpressionNode *base;
+    SourceLocation incrementToken;
+};
+
+class QML_PARSER_EXPORT PostDecrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PostDecrementExpression)
+
+    PostDecrementExpression(ExpressionNode *b):
+        base (b) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return base->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return decrementToken; }
+
+// attributes
+    ExpressionNode *base;
+    SourceLocation decrementToken;
+};
+
+class QML_PARSER_EXPORT DeleteExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DeleteExpression)
+
+    DeleteExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return deleteToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation deleteToken;
+};
+
+class QML_PARSER_EXPORT VoidExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VoidExpression)
+
+    VoidExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return voidToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation voidToken;
+};
+
+class QML_PARSER_EXPORT TypeOfExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TypeOfExpression)
+
+    TypeOfExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return typeofToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation typeofToken;
+};
+
+class QML_PARSER_EXPORT PreIncrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PreIncrementExpression)
+
+    PreIncrementExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return incrementToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation incrementToken;
+};
+
+class QML_PARSER_EXPORT PreDecrementExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(PreDecrementExpression)
+
+    PreDecrementExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return decrementToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation decrementToken;
+};
+
+class QML_PARSER_EXPORT UnaryPlusExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UnaryPlusExpression)
+
+    UnaryPlusExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return plusToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation plusToken;
+};
+
+class QML_PARSER_EXPORT UnaryMinusExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UnaryMinusExpression)
+
+    UnaryMinusExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return minusToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation minusToken;
+};
+
+class QML_PARSER_EXPORT TildeExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TildeExpression)
+
+    TildeExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return tildeToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation tildeToken;
+};
+
+class QML_PARSER_EXPORT NotExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(NotExpression)
+
+    NotExpression(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return notToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return expression->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation notToken;
+};
+
+class QML_PARSER_EXPORT BinaryExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(BinaryExpression)
+
+    BinaryExpression(ExpressionNode *l, int o, ExpressionNode *r):
+        left (l), op (o), right (r)
+        { kind = K; }
+
+    virtual BinaryExpression *binaryExpressionCast();
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return left->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return right->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *left;
+    int op;
+    ExpressionNode *right;
+    SourceLocation operatorToken;
+};
+
+class QML_PARSER_EXPORT ConditionalExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ConditionalExpression)
+
+    ConditionalExpression(ExpressionNode *e, ExpressionNode *t, ExpressionNode *f):
+        expression (e), ok (t), ko (f)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return expression->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return ko->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    ExpressionNode *ok;
+    ExpressionNode *ko;
+    SourceLocation questionToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT Expression: public ExpressionNode // ### rename
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Expression)
+
+    Expression(ExpressionNode *l, ExpressionNode *r):
+        left (l), right (r) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return left->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return right->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *left;
+    ExpressionNode *right;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT Block: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Block)
+
+    Block(StatementList *slist):
+        statements (slist) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return lbraceToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+    // attributes
+    StatementList *statements;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT StatementList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StatementList)
+
+    StatementList(Statement *stmt):
+        statement (stmt), next (this)
+        { kind = K; }
+
+    StatementList(StatementList *previous, Statement *stmt):
+        statement (stmt)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline StatementList *finish ()
+    {
+        StatementList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    Statement *statement;
+    StatementList *next;
+};
+
+class QML_PARSER_EXPORT VariableStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableStatement)
+
+    VariableStatement(VariableDeclarationList *vlist):
+        declarations (vlist)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return declarationKindToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    VariableDeclarationList *declarations;
+    SourceLocation declarationKindToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT VariableDeclaration: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableDeclaration)
+
+    VariableDeclaration(NameId *n, ExpressionNode *e):
+        name (n), expression (e), readOnly(false)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    ExpressionNode *expression;
+    bool readOnly;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT VariableDeclarationList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(VariableDeclarationList)
+
+    VariableDeclarationList(VariableDeclaration *decl):
+        declaration (decl), next (this)
+        { kind = K; }
+
+    VariableDeclarationList(VariableDeclarationList *previous, VariableDeclaration *decl):
+        declaration (decl)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline VariableDeclarationList *finish (bool readOnly)
+    {
+        VariableDeclarationList *front = next;
+        next = 0;
+        if (readOnly) {
+            VariableDeclarationList *vdl;
+            for (vdl = front; vdl != 0; vdl = vdl->next)
+                vdl->declaration->readOnly = true;
+        }
+        return front;
+    }
+
+// attributes
+    VariableDeclaration *declaration;
+    VariableDeclarationList *next;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT EmptyStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(EmptyStatement)
+
+    EmptyStatement() { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return semicolonToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT ExpressionStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ExpressionStatement)
+
+    ExpressionStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return expression->firstSourceLocation(); }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT IfStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(IfStatement)
+
+    IfStatement(ExpressionNode *e, Statement *t, Statement *f = 0):
+        expression (e), ok (t), ko (f)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return ifToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        if (ko)
+            return ko->lastSourceLocation();
+
+        return ok->lastSourceLocation();
+    }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *ok;
+    Statement *ko;
+    SourceLocation ifToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation elseToken;
+};
+
+class QML_PARSER_EXPORT DoWhileStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DoWhileStatement)
+
+    DoWhileStatement(Statement *stmt, ExpressionNode *e):
+        statement (stmt), expression (e)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return doToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    Statement *statement;
+    ExpressionNode *expression;
+    SourceLocation doToken;
+    SourceLocation whileToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT WhileStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(WhileStatement)
+
+    WhileStatement(ExpressionNode *e, Statement *stmt):
+        expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return whileToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation whileToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ForStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ForStatement)
+
+    ForStatement(ExpressionNode *i, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
+        initialiser (i), condition (c), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *initialiser;
+    ExpressionNode *condition;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation firstSemicolonToken;
+    SourceLocation secondSemicolonToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT LocalForStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LocalForStatement)
+
+    LocalForStatement(VariableDeclarationList *vlist, ExpressionNode *c, ExpressionNode *e, Statement *stmt):
+        declarations (vlist), condition (c), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    VariableDeclarationList *declarations;
+    ExpressionNode *condition;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation varToken;
+    SourceLocation firstSemicolonToken;
+    SourceLocation secondSemicolonToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ForEachStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ForEachStatement)
+
+    ForEachStatement(ExpressionNode *i, ExpressionNode *e, Statement *stmt):
+        initialiser (i), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *initialiser;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation inToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT LocalForEachStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LocalForEachStatement)
+
+    LocalForEachStatement(VariableDeclaration *v, ExpressionNode *e, Statement *stmt):
+        declaration (v), expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return forToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    VariableDeclaration *declaration;
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation forToken;
+    SourceLocation lparenToken;
+    SourceLocation varToken;
+    SourceLocation inToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT ContinueStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ContinueStatement)
+
+    ContinueStatement(NameId *l = 0):
+        label (l) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return continueToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    NameId *label;
+    SourceLocation continueToken;
+    SourceLocation identifierToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT BreakStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(BreakStatement)
+
+    BreakStatement(NameId *l = 0):
+        label (l) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return breakToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    // attributes
+    NameId *label;
+    SourceLocation breakToken;
+    SourceLocation identifierToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT ReturnStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ReturnStatement)
+
+    ReturnStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return returnToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    ExpressionNode *expression;
+    SourceLocation returnToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT WithStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(WithStatement)
+
+    WithStatement(ExpressionNode *e, Statement *stmt):
+        expression (e), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return withToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    ExpressionNode *expression;
+    Statement *statement;
+    SourceLocation withToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT CaseBlock: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseBlock)
+
+    CaseBlock(CaseClauses *c, DefaultClause *d = 0, CaseClauses *r = 0):
+        clauses (c), defaultClause (d), moreClauses (r)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    CaseClauses *clauses;
+    DefaultClause *defaultClause;
+    CaseClauses *moreClauses;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT SwitchStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SwitchStatement)
+
+    SwitchStatement(ExpressionNode *e, CaseBlock *b):
+        expression (e), block (b)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return switchToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return block->rbraceToken; }
+
+// attributes
+    ExpressionNode *expression;
+    CaseBlock *block;
+    SourceLocation switchToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT CaseClauses: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseClauses)
+
+    CaseClauses(CaseClause *c):
+        clause (c), next (this)
+        { kind = K; }
+
+    CaseClauses(CaseClauses *previous, CaseClause *c):
+        clause (c)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline CaseClauses *finish ()
+    {
+        CaseClauses *front = next;
+        next = 0;
+        return front;
+    }
+
+//attributes
+    CaseClause *clause;
+    CaseClauses *next;
+};
+
+class QML_PARSER_EXPORT CaseClause: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(CaseClause)
+
+    CaseClause(ExpressionNode *e, StatementList *slist):
+        expression (e), statements (slist)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    ExpressionNode *expression;
+    StatementList *statements;
+    SourceLocation caseToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT DefaultClause: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DefaultClause)
+
+    DefaultClause(StatementList *slist):
+        statements (slist)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    StatementList *statements;
+    SourceLocation defaultToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT LabelledStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(LabelledStatement)
+
+    LabelledStatement(NameId *l, Statement *stmt):
+        label (l), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+// attributes
+    NameId *label;
+    Statement *statement;
+    SourceLocation identifierToken;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT ThrowStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(ThrowStatement)
+
+    ThrowStatement(ExpressionNode *e):
+        expression (e) { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return throwToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    // attributes
+    ExpressionNode *expression;
+    SourceLocation throwToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT Catch: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Catch)
+
+    Catch(NameId *n, Block *stmt):
+        name (n), statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *name;
+    Block *statement;
+    SourceLocation catchToken;
+    SourceLocation lparenToken;
+    SourceLocation identifierToken;
+    SourceLocation rparenToken;
+};
+
+class QML_PARSER_EXPORT Finally: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Finally)
+
+    Finally(Block *stmt):
+        statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Block *statement;
+    SourceLocation finallyToken;
+};
+
+class QML_PARSER_EXPORT TryStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(TryStatement)
+
+    TryStatement(Statement *stmt, Catch *c, Finally *f):
+        statement (stmt), catchExpression (c), finallyExpression (f)
+        { kind = K; }
+
+    TryStatement(Statement *stmt, Finally *f):
+        statement (stmt), catchExpression (0), finallyExpression (f)
+        { kind = K; }
+
+    TryStatement(Statement *stmt, Catch *c):
+        statement (stmt), catchExpression (c), finallyExpression (0)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return tryToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        if (finallyExpression)
+            return finallyExpression->statement->rbraceToken;
+        else if (catchExpression)
+            return catchExpression->statement->rbraceToken;
+
+        return statement->lastSourceLocation();
+    }
+
+// attributes
+    Statement *statement;
+    Catch *catchExpression;
+    Finally *finallyExpression;
+    SourceLocation tryToken;
+};
+
+class QML_PARSER_EXPORT FunctionExpression: public ExpressionNode
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionExpression)
+
+    FunctionExpression(NameId *n, FormalParameterList *f, FunctionBody *b):
+        name (n), formals (f), body (b)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return functionToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbraceToken; }
+
+// attributes
+    NameId *name;
+    FormalParameterList *formals;
+    FunctionBody *body;
+    SourceLocation functionToken;
+    SourceLocation identifierToken;
+    SourceLocation lparenToken;
+    SourceLocation rparenToken;
+    SourceLocation lbraceToken;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT FunctionDeclaration: public FunctionExpression
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionDeclaration)
+
+    FunctionDeclaration(NameId *n, FormalParameterList *f, FunctionBody *b):
+        FunctionExpression(n, f, b)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+};
+
+class QML_PARSER_EXPORT FormalParameterList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FormalParameterList)
+
+    FormalParameterList(NameId *n):
+        name (n), next (this)
+        { kind = K; }
+
+    FormalParameterList(FormalParameterList *previous, NameId *n):
+        name (n)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline FormalParameterList *finish ()
+    {
+        FormalParameterList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    NameId *name;
+    FormalParameterList *next;
+    SourceLocation commaToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT FunctionBody: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionBody)
+
+    FunctionBody(SourceElements *elts):
+        elements (elts)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceElements *elements;
+};
+
+class QML_PARSER_EXPORT Program: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(Program)
+
+    Program(SourceElements *elts):
+        elements (elts)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceElements *elements;
+};
+
+class QML_PARSER_EXPORT SourceElements: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SourceElements)
+
+    SourceElements(SourceElement *elt):
+        element (elt), next (this)
+        { kind = K; }
+
+    SourceElements(SourceElements *previous, SourceElement *elt):
+        element (elt)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    inline SourceElements *finish ()
+    {
+        SourceElements *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    SourceElement *element;
+    SourceElements *next;
+};
+
+class QML_PARSER_EXPORT SourceElement: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(SourceElement)
+
+    inline SourceElement()
+        { kind = K; }
+};
+
+class QML_PARSER_EXPORT FunctionSourceElement: public SourceElement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(FunctionSourceElement)
+
+    FunctionSourceElement(FunctionDeclaration *f):
+        declaration (f)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    FunctionDeclaration *declaration;
+};
+
+class QML_PARSER_EXPORT StatementSourceElement: public SourceElement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(StatementSourceElement)
+
+    StatementSourceElement(Statement *stmt):
+        statement (stmt)
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Statement *statement;
+};
+
+class QML_PARSER_EXPORT DebuggerStatement: public Statement
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(DebuggerStatement)
+
+    DebuggerStatement()
+        { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+    virtual SourceLocation firstSourceLocation() const
+    { return debuggerToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+// attributes
+    SourceLocation debuggerToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiProgram: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiProgram)
+
+    UiProgram(UiImportList *imports, UiObjectMemberList *members)
+        : imports(imports), members(members)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiImportList *imports;
+    UiObjectMemberList *members;
+};
+
+class QML_PARSER_EXPORT UiQualifiedId: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiQualifiedId)
+
+    UiQualifiedId(NameId *name)
+        : next(this), name(name)
+    { kind = K; }
+
+    UiQualifiedId(UiQualifiedId *previous, NameId *name)
+        : name(name)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    UiQualifiedId *finish()
+    {
+        UiQualifiedId *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *next;
+    NameId *name;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT UiImport: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiImport)
+
+    UiImport(NameId *fileName)
+        : fileName(fileName), importUri(0), importId(0)
+    { kind = K; }
+
+    UiImport(UiQualifiedId *uri)
+        : fileName(0), importUri(uri), importId(0)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return importToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return semicolonToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    NameId *fileName;
+    UiQualifiedId *importUri;
+    NameId *importId;
+    SourceLocation importToken;
+    SourceLocation fileNameToken;
+    SourceLocation versionToken;
+    SourceLocation asToken;
+    SourceLocation importIdToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiImportList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiImportList)
+
+    UiImportList(UiImport *import)
+        : import(import),
+          next(this)
+    { kind = K; }
+
+    UiImportList(UiImportList *previous, UiImport *import)
+        : import(import)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+        if (import) return import->firstSourceLocation();
+        else return SourceLocation();
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+        for (const UiImportList *it = this; it; it = it->next)
+            if (!it->next && it->import)
+                return it->import->lastSourceLocation();
+
+        return SourceLocation();
+    }
+
+    UiImportList *finish()
+    {
+        UiImportList *head = next;
+        next = 0;
+        return head;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiImport *import;
+    UiImportList *next;
+};
+
+class QML_PARSER_EXPORT UiObjectMember: public Node
+{
+public:
+    virtual SourceLocation firstSourceLocation() const = 0;
+    virtual SourceLocation lastSourceLocation() const = 0;
+
+    virtual UiObjectMember *uiObjectMemberCast();
+};
+
+class QML_PARSER_EXPORT UiObjectMemberList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectMemberList)
+
+    UiObjectMemberList(UiObjectMember *member)
+        : next(this), member(member)
+    { kind = K; }
+
+    UiObjectMemberList(UiObjectMemberList *previous, UiObjectMember *member)
+        : member(member)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    UiObjectMemberList *finish()
+    {
+        UiObjectMemberList *head = next;
+        next = 0;
+        return head;
+    }
+
+// attributes
+    UiObjectMemberList *next;
+    UiObjectMember *member;
+};
+
+class QML_PARSER_EXPORT UiArrayMemberList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiArrayMemberList)
+
+    UiArrayMemberList(UiObjectMember *member)
+        : next(this), member(member)
+    { kind = K; }
+
+    UiArrayMemberList(UiArrayMemberList *previous, UiObjectMember *member)
+        : member(member)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+    UiArrayMemberList *finish()
+    {
+        UiArrayMemberList *head = next;
+        next = 0;
+        return head;
+    }
+
+// attributes
+    UiArrayMemberList *next;
+    UiObjectMember *member;
+    SourceLocation commaToken;
+};
+
+class QML_PARSER_EXPORT UiObjectInitializer: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectInitializer)
+
+    UiObjectInitializer(UiObjectMemberList *members)
+        : members(members)
+    { kind = K; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    SourceLocation lbraceToken;
+    UiObjectMemberList *members;
+    SourceLocation rbraceToken;
+};
+
+class QML_PARSER_EXPORT UiParameterList: public Node
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiParameterList)
+
+    UiParameterList(NameId *t, NameId *n):
+        type (t), name (n), next (this)
+        { kind = K; }
+
+    UiParameterList(UiParameterList *previous, NameId *t, NameId *n):
+        type (t), name (n)
+    {
+        kind = K;
+        next = previous->next;
+        previous->next = this;
+    }
+
+    virtual void accept0(Visitor *) {}
+
+    inline UiParameterList *finish ()
+    {
+        UiParameterList *front = next;
+        next = 0;
+        return front;
+    }
+
+// attributes
+    NameId *type;
+    NameId *name;
+    UiParameterList *next;
+    SourceLocation commaToken;
+    SourceLocation identifierToken;
+};
+
+class QML_PARSER_EXPORT UiPublicMember: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiPublicMember)
+
+    UiPublicMember(NameId *memberType,
+                   NameId *name)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(0), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+    { kind = K; }
+
+    UiPublicMember(NameId *memberType,
+                   NameId *name,
+                   ExpressionNode *expression)
+        : type(Property), typeModifier(0), memberType(memberType), name(name), expression(expression), binding(0), isDefaultMember(false), isReadonlyMember(false), parameters(0)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+      if (defaultToken.isValid())
+        return defaultToken;
+      else if (readonlyToken.isValid())
+          return readonlyToken;
+
+      return propertyToken;
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+      if (binding)
+          return binding->lastSourceLocation();
+
+      return semicolonToken;
+    }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    enum { Signal, Property } type;
+    NameId *typeModifier;
+    NameId *memberType;
+    NameId *name;
+    ExpressionNode *expression; // initialized with a JS expression
+    UiObjectMember *binding; // initialized with a QML object or array.
+    bool isDefaultMember;
+    bool isReadonlyMember;
+    UiParameterList *parameters;
+    SourceLocation defaultToken;
+    SourceLocation readonlyToken;
+    SourceLocation propertyToken;
+    SourceLocation typeModifierToken;
+    SourceLocation typeToken;
+    SourceLocation identifierToken;
+    SourceLocation colonToken;
+    SourceLocation semicolonToken;
+};
+
+class QML_PARSER_EXPORT UiObjectDefinition: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectDefinition)
+
+    UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
+                       UiObjectInitializer *initializer)
+        : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedTypeNameId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return initializer->rbraceToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedTypeNameId;
+    UiObjectInitializer *initializer;
+};
+
+class QML_PARSER_EXPORT UiSourceElement: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiSourceElement)
+
+    UiSourceElement(Node *sourceElement)
+        : sourceElement(sourceElement)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
+        return funDecl->firstSourceLocation();
+      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
+        return varStmt->firstSourceLocation();
+
+      return SourceLocation();
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    {
+      if (FunctionDeclaration *funDecl = cast<FunctionDeclaration *>(sourceElement))
+        return funDecl->lastSourceLocation();
+      else if (VariableStatement *varStmt = cast<VariableStatement *>(sourceElement))
+        return varStmt->lastSourceLocation();
+
+      return SourceLocation();
+    }
+
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    Node *sourceElement;
+};
+
+class QML_PARSER_EXPORT UiObjectBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiObjectBinding)
+
+    UiObjectBinding(UiQualifiedId *qualifiedId,
+                    UiQualifiedId *qualifiedTypeNameId,
+                    UiObjectInitializer *initializer)
+        : qualifiedId(qualifiedId),
+          qualifiedTypeNameId(qualifiedTypeNameId),
+          initializer(initializer),
+          hasOnToken(false)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    {
+        if (hasOnToken && qualifiedTypeNameId)
+            return qualifiedTypeNameId->identifierToken;
+
+        return qualifiedId->identifierToken;
+    }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return initializer->rbraceToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    UiQualifiedId *qualifiedTypeNameId;
+    UiObjectInitializer *initializer;
+    SourceLocation colonToken;
+    bool hasOnToken;
+};
+
+class QML_PARSER_EXPORT UiScriptBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiScriptBinding)
+
+    UiScriptBinding(UiQualifiedId *qualifiedId,
+                    Statement *statement)
+        : qualifiedId(qualifiedId),
+          statement(statement)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return statement->lastSourceLocation(); }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    Statement *statement;
+    SourceLocation colonToken;
+};
+
+class QML_PARSER_EXPORT UiArrayBinding: public UiObjectMember
+{
+public:
+    QDECLARATIVEJS_DECLARE_AST_NODE(UiArrayBinding)
+
+    UiArrayBinding(UiQualifiedId *qualifiedId,
+                   UiArrayMemberList *members)
+        : qualifiedId(qualifiedId),
+          members(members)
+    { kind = K; }
+
+    virtual SourceLocation firstSourceLocation() const
+    { return qualifiedId->identifierToken; }
+
+    virtual SourceLocation lastSourceLocation() const
+    { return rbracketToken; }
+
+    virtual void accept0(Visitor *visitor);
+
+// attributes
+    UiQualifiedId *qualifiedId;
+    UiArrayMemberList *members;
+    SourceLocation colonToken;
+    SourceLocation lbracketToken;
+    SourceLocation rbracketToken;
+};
+
+} } // namespace AST
+
+
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsastfwd_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsastfwd_p.h
new file mode 100644
index 0000000..8344d54
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsastfwd_p.h
@@ -0,0 +1,189 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSAST_FWD_P_H
+#define QDECLARATIVEJSAST_FWD_P_H
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/qglobal.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+class SourceLocation
+{
+public:
+    SourceLocation(quint32 offset = 0, quint32 length = 0, quint32 line = 0, quint32 column = 0)
+        : offset(offset), length(length),
+          startLine(line), startColumn(column)
+    { }
+
+    bool isValid() const { return length != 0; }
+
+    quint32 begin() const { return offset; }
+    quint32 end() const { return offset + length; }
+
+// attributes
+    // ### encode
+    quint32 offset;
+    quint32 length;
+    quint32 startLine;
+    quint32 startColumn;
+};
+
+class Visitor;
+class Node;
+class ExpressionNode;
+class Statement;
+class ThisExpression;
+class IdentifierExpression;
+class NullExpression;
+class TrueLiteral;
+class FalseLiteral;
+class NumericLiteral;
+class StringLiteral;
+class RegExpLiteral;
+class ArrayLiteral;
+class ObjectLiteral;
+class ElementList;
+class Elision;
+class PropertyNameAndValueList;
+class PropertyName;
+class IdentifierPropertyName;
+class StringLiteralPropertyName;
+class NumericLiteralPropertyName;
+class ArrayMemberExpression;
+class FieldMemberExpression;
+class NewMemberExpression;
+class NewExpression;
+class CallExpression;
+class ArgumentList;
+class PostIncrementExpression;
+class PostDecrementExpression;
+class DeleteExpression;
+class VoidExpression;
+class TypeOfExpression;
+class PreIncrementExpression;
+class PreDecrementExpression;
+class UnaryPlusExpression;
+class UnaryMinusExpression;
+class TildeExpression;
+class NotExpression;
+class BinaryExpression;
+class ConditionalExpression;
+class Expression; // ### rename
+class Block;
+class StatementList;
+class VariableStatement;
+class VariableDeclarationList;
+class VariableDeclaration;
+class EmptyStatement;
+class ExpressionStatement;
+class IfStatement;
+class DoWhileStatement;
+class WhileStatement;
+class ForStatement;
+class LocalForStatement;
+class ForEachStatement;
+class LocalForEachStatement;
+class ContinueStatement;
+class BreakStatement;
+class ReturnStatement;
+class WithStatement;
+class SwitchStatement;
+class CaseBlock;
+class CaseClauses;
+class CaseClause;
+class DefaultClause;
+class LabelledStatement;
+class ThrowStatement;
+class TryStatement;
+class Catch;
+class Finally;
+class FunctionDeclaration;
+class FunctionExpression;
+class FormalParameterList;
+class FunctionBody;
+class Program;
+class SourceElements;
+class SourceElement;
+class FunctionSourceElement;
+class StatementSourceElement;
+class DebuggerStatement;
+class NestedExpression;
+
+// ui elements
+class UiProgram;
+class UiImportList;
+class UiImport;
+class UiPublicMember;
+class UiObjectDefinition;
+class UiObjectInitializer;
+class UiObjectBinding;
+class UiScriptBinding;
+class UiSourceElement;
+class UiArrayBinding;
+class UiObjectMember;
+class UiObjectMemberList;
+class UiArrayMemberList;
+class UiQualifiedId;
+class UiFormalList;
+class UiFormal;
+class UiSignature;
+
+} } // namespace AST
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor.cpp b/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor.cpp
new file mode 100644
index 0000000..b4eecc1
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsastvisitor_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+Visitor::Visitor()
+{
+}
+
+Visitor::~Visitor()
+{
+}
+
+} } // namespace QDeclarativeJS::AST
+
+QT_QML_END_NAMESPACE
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor_p.h
new file mode 100644
index 0000000..6ef7c81
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsastvisitor_p.h
@@ -0,0 +1,335 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSASTVISITOR_P_H
+#define QDECLARATIVEJSASTVISITOR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsastfwd_p.h"
+#include "qdeclarativejsglobal_p.h"
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS { namespace AST {
+
+class QML_PARSER_EXPORT Visitor
+{
+public:
+    Visitor();
+    virtual ~Visitor();
+
+    virtual bool preVisit(Node *) { return true; }
+    virtual void postVisit(Node *) {}
+
+    // Ui
+    virtual bool visit(UiProgram *) { return true; }
+    virtual bool visit(UiImportList *) { return true; }
+    virtual bool visit(UiImport *) { return true; }
+    virtual bool visit(UiPublicMember *) { return true; }
+    virtual bool visit(UiSourceElement *) { return true; }
+    virtual bool visit(UiObjectDefinition *) { return true; }
+    virtual bool visit(UiObjectInitializer *) { return true; }
+    virtual bool visit(UiObjectBinding *) { return true; }
+    virtual bool visit(UiScriptBinding *) { return true; }
+    virtual bool visit(UiArrayBinding *) { return true; }
+    virtual bool visit(UiObjectMemberList *) { return true; }
+    virtual bool visit(UiArrayMemberList *) { return true; }
+    virtual bool visit(UiQualifiedId *) { return true; }
+    virtual bool visit(UiSignature *) { return true; }
+    virtual bool visit(UiFormalList *) { return true; }
+    virtual bool visit(UiFormal *) { return true; }
+
+    virtual void endVisit(UiProgram *) {}
+    virtual void endVisit(UiImportList *) {}
+    virtual void endVisit(UiImport *) {}
+    virtual void endVisit(UiPublicMember *) {}
+    virtual void endVisit(UiSourceElement *) {}
+    virtual void endVisit(UiObjectDefinition *) {}
+    virtual void endVisit(UiObjectInitializer *) {}
+    virtual void endVisit(UiObjectBinding *) {}
+    virtual void endVisit(UiScriptBinding *) {}
+    virtual void endVisit(UiArrayBinding *) {}
+    virtual void endVisit(UiObjectMemberList *) {}
+    virtual void endVisit(UiArrayMemberList *) {}
+    virtual void endVisit(UiQualifiedId *) {}
+    virtual void endVisit(UiSignature *) {}
+    virtual void endVisit(UiFormalList *) {}
+    virtual void endVisit(UiFormal *) {}
+
+    // QDeclarativeJS
+    virtual bool visit(ThisExpression *) { return true; }
+    virtual void endVisit(ThisExpression *) {}
+
+    virtual bool visit(IdentifierExpression *) { return true; }
+    virtual void endVisit(IdentifierExpression *) {}
+
+    virtual bool visit(NullExpression *) { return true; }
+    virtual void endVisit(NullExpression *) {}
+
+    virtual bool visit(TrueLiteral *) { return true; }
+    virtual void endVisit(TrueLiteral *) {}
+
+    virtual bool visit(FalseLiteral *) { return true; }
+    virtual void endVisit(FalseLiteral *) {}
+
+    virtual bool visit(StringLiteral *) { return true; }
+    virtual void endVisit(StringLiteral *) {}
+
+    virtual bool visit(NumericLiteral *) { return true; }
+    virtual void endVisit(NumericLiteral *) {}
+
+    virtual bool visit(RegExpLiteral *) { return true; }
+    virtual void endVisit(RegExpLiteral *) {}
+
+    virtual bool visit(ArrayLiteral *) { return true; }
+    virtual void endVisit(ArrayLiteral *) {}
+
+    virtual bool visit(ObjectLiteral *) { return true; }
+    virtual void endVisit(ObjectLiteral *) {}
+
+    virtual bool visit(ElementList *) { return true; }
+    virtual void endVisit(ElementList *) {}
+
+    virtual bool visit(Elision *) { return true; }
+    virtual void endVisit(Elision *) {}
+
+    virtual bool visit(PropertyNameAndValueList *) { return true; }
+    virtual void endVisit(PropertyNameAndValueList *) {}
+
+    virtual bool visit(NestedExpression *) { return true; }
+    virtual void endVisit(NestedExpression *) {}
+
+    virtual bool visit(IdentifierPropertyName *) { return true; }
+    virtual void endVisit(IdentifierPropertyName *) {}
+
+    virtual bool visit(StringLiteralPropertyName *) { return true; }
+    virtual void endVisit(StringLiteralPropertyName *) {}
+
+    virtual bool visit(NumericLiteralPropertyName *) { return true; }
+    virtual void endVisit(NumericLiteralPropertyName *) {}
+
+    virtual bool visit(ArrayMemberExpression *) { return true; }
+    virtual void endVisit(ArrayMemberExpression *) {}
+
+    virtual bool visit(FieldMemberExpression *) { return true; }
+    virtual void endVisit(FieldMemberExpression *) {}
+
+    virtual bool visit(NewMemberExpression *) { return true; }
+    virtual void endVisit(NewMemberExpression *) {}
+
+    virtual bool visit(NewExpression *) { return true; }
+    virtual void endVisit(NewExpression *) {}
+
+    virtual bool visit(CallExpression *) { return true; }
+    virtual void endVisit(CallExpression *) {}
+
+    virtual bool visit(ArgumentList *) { return true; }
+    virtual void endVisit(ArgumentList *) {}
+
+    virtual bool visit(PostIncrementExpression *) { return true; }
+    virtual void endVisit(PostIncrementExpression *) {}
+
+    virtual bool visit(PostDecrementExpression *) { return true; }
+    virtual void endVisit(PostDecrementExpression *) {}
+
+    virtual bool visit(DeleteExpression *) { return true; }
+    virtual void endVisit(DeleteExpression *) {}
+
+    virtual bool visit(VoidExpression *) { return true; }
+    virtual void endVisit(VoidExpression *) {}
+
+    virtual bool visit(TypeOfExpression *) { return true; }
+    virtual void endVisit(TypeOfExpression *) {}
+
+    virtual bool visit(PreIncrementExpression *) { return true; }
+    virtual void endVisit(PreIncrementExpression *) {}
+
+    virtual bool visit(PreDecrementExpression *) { return true; }
+    virtual void endVisit(PreDecrementExpression *) {}
+
+    virtual bool visit(UnaryPlusExpression *) { return true; }
+    virtual void endVisit(UnaryPlusExpression *) {}
+
+    virtual bool visit(UnaryMinusExpression *) { return true; }
+    virtual void endVisit(UnaryMinusExpression *) {}
+
+    virtual bool visit(TildeExpression *) { return true; }
+    virtual void endVisit(TildeExpression *) {}
+
+    virtual bool visit(NotExpression *) { return true; }
+    virtual void endVisit(NotExpression *) {}
+
+    virtual bool visit(BinaryExpression *) { return true; }
+    virtual void endVisit(BinaryExpression *) {}
+
+    virtual bool visit(ConditionalExpression *) { return true; }
+    virtual void endVisit(ConditionalExpression *) {}
+
+    virtual bool visit(Expression *) { return true; }
+    virtual void endVisit(Expression *) {}
+
+    virtual bool visit(Block *) { return true; }
+    virtual void endVisit(Block *) {}
+
+    virtual bool visit(StatementList *) { return true; }
+    virtual void endVisit(StatementList *) {}
+
+    virtual bool visit(VariableStatement *) { return true; }
+    virtual void endVisit(VariableStatement *) {}
+
+    virtual bool visit(VariableDeclarationList *) { return true; }
+    virtual void endVisit(VariableDeclarationList *) {}
+
+    virtual bool visit(VariableDeclaration *) { return true; }
+    virtual void endVisit(VariableDeclaration *) {}
+
+    virtual bool visit(EmptyStatement *) { return true; }
+    virtual void endVisit(EmptyStatement *) {}
+
+    virtual bool visit(ExpressionStatement *) { return true; }
+    virtual void endVisit(ExpressionStatement *) {}
+
+    virtual bool visit(IfStatement *) { return true; }
+    virtual void endVisit(IfStatement *) {}
+
+    virtual bool visit(DoWhileStatement *) { return true; }
+    virtual void endVisit(DoWhileStatement *) {}
+
+    virtual bool visit(WhileStatement *) { return true; }
+    virtual void endVisit(WhileStatement *) {}
+
+    virtual bool visit(ForStatement *) { return true; }
+    virtual void endVisit(ForStatement *) {}
+
+    virtual bool visit(LocalForStatement *) { return true; }
+    virtual void endVisit(LocalForStatement *) {}
+
+    virtual bool visit(ForEachStatement *) { return true; }
+    virtual void endVisit(ForEachStatement *) {}
+
+    virtual bool visit(LocalForEachStatement *) { return true; }
+    virtual void endVisit(LocalForEachStatement *) {}
+
+    virtual bool visit(ContinueStatement *) { return true; }
+    virtual void endVisit(ContinueStatement *) {}
+
+    virtual bool visit(BreakStatement *) { return true; }
+    virtual void endVisit(BreakStatement *) {}
+
+    virtual bool visit(ReturnStatement *) { return true; }
+    virtual void endVisit(ReturnStatement *) {}
+
+    virtual bool visit(WithStatement *) { return true; }
+    virtual void endVisit(WithStatement *) {}
+
+    virtual bool visit(SwitchStatement *) { return true; }
+    virtual void endVisit(SwitchStatement *) {}
+
+    virtual bool visit(CaseBlock *) { return true; }
+    virtual void endVisit(CaseBlock *) {}
+
+    virtual bool visit(CaseClauses *) { return true; }
+    virtual void endVisit(CaseClauses *) {}
+
+    virtual bool visit(CaseClause *) { return true; }
+    virtual void endVisit(CaseClause *) {}
+
+    virtual bool visit(DefaultClause *) { return true; }
+    virtual void endVisit(DefaultClause *) {}
+
+    virtual bool visit(LabelledStatement *) { return true; }
+    virtual void endVisit(LabelledStatement *) {}
+
+    virtual bool visit(ThrowStatement *) { return true; }
+    virtual void endVisit(ThrowStatement *) {}
+
+    virtual bool visit(TryStatement *) { return true; }
+    virtual void endVisit(TryStatement *) {}
+
+    virtual bool visit(Catch *) { return true; }
+    virtual void endVisit(Catch *) {}
+
+    virtual bool visit(Finally *) { return true; }
+    virtual void endVisit(Finally *) {}
+
+    virtual bool visit(FunctionDeclaration *) { return true; }
+    virtual void endVisit(FunctionDeclaration *) {}
+
+    virtual bool visit(FunctionExpression *) { return true; }
+    virtual void endVisit(FunctionExpression *) {}
+
+    virtual bool visit(FormalParameterList *) { return true; }
+    virtual void endVisit(FormalParameterList *) {}
+
+    virtual bool visit(FunctionBody *) { return true; }
+    virtual void endVisit(FunctionBody *) {}
+
+    virtual bool visit(Program *) { return true; }
+    virtual void endVisit(Program *) {}
+
+    virtual bool visit(SourceElements *) { return true; }
+    virtual void endVisit(SourceElements *) {}
+
+    virtual bool visit(FunctionSourceElement *) { return true; }
+    virtual void endVisit(FunctionSourceElement *) {}
+
+    virtual bool visit(StatementSourceElement *) { return true; }
+    virtual void endVisit(StatementSourceElement *) {}
+
+    virtual bool visit(DebuggerStatement *) { return true; }
+    virtual void endVisit(DebuggerStatement *) {}
+};
+
+} } // namespace AST
+
+QT_QML_END_NAMESPACE
+
+#endif // QDECLARATIVEJSASTVISITOR_P_H
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.cpp b/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.cpp
new file mode 100644
index 0000000..4d135c2
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.cpp
@@ -0,0 +1,212 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativejsengine_p.h"
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsnodepool_p.h"
+
+#include <qnumeric.h>
+#include <QHash>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+uint qHash(const QDeclarativeJS::NameId &id)
+{ return qHash(id.asString()); }
+
+QString numberToString(double value)
+{ return QString::number(value); }
+
+int Ecma::RegExp::flagFromChar(const QChar &ch)
+{
+    static QHash<QChar, int> flagsHash;
+    if (flagsHash.isEmpty()) {
+        flagsHash[QLatin1Char('g')] = Global;
+        flagsHash[QLatin1Char('i')] = IgnoreCase;
+        flagsHash[QLatin1Char('m')] = Multiline;
+    }
+    QHash<QChar, int>::const_iterator it;
+    it = flagsHash.constFind(ch);
+    if (it == flagsHash.constEnd())
+        return 0;
+    return it.value();
+}
+
+QString Ecma::RegExp::flagsToString(int flags)
+{
+    QString result;
+    if (flags & Global)
+        result += QLatin1Char('g');
+    if (flags & IgnoreCase)
+        result += QLatin1Char('i');
+    if (flags & Multiline)
+        result += QLatin1Char('m');
+    return result;
+}
+
+NodePool::NodePool(const QString &fileName, Engine *engine)
+    : m_fileName(fileName), m_engine(engine)
+{
+    m_engine->setNodePool(this);
+}
+
+NodePool::~NodePool()
+{
+}
+
+Code *NodePool::createCompiledCode(AST::Node *, CompilationUnit &)
+{
+    Q_ASSERT(0);
+    return 0;
+}
+
+static int toDigit(char c)
+{
+    if ((c >= '0') && (c <= '9'))
+        return c - '0';
+    else if ((c >= 'a') && (c <= 'z'))
+        return 10 + c - 'a';
+    else if ((c >= 'A') && (c <= 'Z'))
+        return 10 + c - 'A';
+    return -1;
+}
+
+double integerFromString(const char *buf, int size, int radix)
+{
+    if (size == 0)
+        return qSNaN();
+
+    double sign = 1.0;
+    int i = 0;
+    if (buf[0] == '+') {
+        ++i;
+    } else if (buf[0] == '-') {
+        sign = -1.0;
+        ++i;
+    }
+
+    if (((size-i) >= 2) && (buf[i] == '0')) {
+        if (((buf[i+1] == 'x') || (buf[i+1] == 'X'))
+            && (radix < 34)) {
+            if ((radix != 0) && (radix != 16))
+                return 0;
+            radix = 16;
+            i += 2;
+        } else {
+            if (radix == 0) {
+                radix = 8;
+                ++i;
+            }
+        }
+    } else if (radix == 0) {
+        radix = 10;
+    }
+
+    int j = i;
+    for ( ; i < size; ++i) {
+        int d = toDigit(buf[i]);
+        if ((d == -1) || (d >= radix))
+            break;
+    }
+    double result;
+    if (j == i) {
+        if (!qstrcmp(buf, "Infinity"))
+            result = qInf();
+        else
+            result = qSNaN();
+    } else {
+        result = 0;
+        double multiplier = 1;
+        for (--i ; i >= j; --i, multiplier *= radix)
+            result += toDigit(buf[i]) * multiplier;
+    }
+    result *= sign;
+    return result;
+}
+
+double integerFromString(const QString &str, int radix)
+{
+    QByteArray ba = str.trimmed().toLatin1();
+    return integerFromString(ba.constData(), ba.size(), radix);
+}
+
+
+Engine::Engine()
+    : _lexer(0), _nodePool(0)
+{ }
+
+Engine::~Engine()
+{ }
+
+QSet<NameId> Engine::literals() const
+{ return _literals; }
+
+void Engine::addComment(int pos, int len, int line, int col)
+{ if (len > 0) _comments.append(QDeclarativeJS::AST::SourceLocation(pos, len, line, col)); }
+
+QList<QDeclarativeJS::AST::SourceLocation> Engine::comments() const
+{ return _comments; }
+
+NameId *Engine::intern(const QChar *u, int s)
+{ return const_cast<NameId *>(&*_literals.insert(NameId(u, s))); }
+
+QString Engine::toString(NameId *id)
+{ return id->asString(); }
+
+Lexer *Engine::lexer() const
+{ return _lexer; }
+
+void Engine::setLexer(Lexer *lexer)
+{ _lexer = lexer; }
+
+NodePool *Engine::nodePool() const
+{ return _nodePool; }
+
+void Engine::setNodePool(NodePool *nodePool)
+{ _nodePool = nodePool; }
+
+
+
+} // end of namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.h
new file mode 100644
index 0000000..c6126ea
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsengine_p.h
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSENGINE_P_H
+#define QDECLARATIVEJSENGINE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsastfwd_p.h"
+
+#include <QString>
+#include <QSet>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+class QML_PARSER_EXPORT NameId
+{
+    QString _text;
+
+public:
+    NameId(const QChar *u, int s)
+        : _text(u, s)
+    { }
+
+    const QString asString() const
+    { return _text; }
+
+    bool operator == (const NameId &other) const
+    { return _text == other._text; }
+
+    bool operator != (const NameId &other) const
+    { return _text != other._text; }
+
+    bool operator < (const NameId &other) const
+    { return _text < other._text; }
+};
+
+uint qHash(const QDeclarativeJS::NameId &id);
+
+} // end of namespace QDeclarativeJS
+
+#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
+//this ensures that code outside QDeclarativeJS can use the hash function
+//it also a workaround for some compilers
+inline uint qHash(const QDeclarativeJS::NameId &nameId) { return QDeclarativeJS::qHash(nameId); }
+#endif
+
+namespace QDeclarativeJS {
+
+class Lexer;
+class NodePool;
+
+namespace Ecma {
+
+class QML_PARSER_EXPORT RegExp
+{
+public:
+    enum RegExpFlag {
+        Global     = 0x01,
+        IgnoreCase = 0x02,
+        Multiline  = 0x04
+    };
+
+public:
+    static int flagFromChar(const QChar &);
+    static QString flagsToString(int flags);
+};
+
+} // end of namespace Ecma
+
+class QML_PARSER_EXPORT DiagnosticMessage
+{
+public:
+    enum Kind { Warning, Error };
+
+    DiagnosticMessage()
+        : kind(Error) {}
+
+    DiagnosticMessage(Kind kind, const AST::SourceLocation &loc, const QString &message)
+        : kind(kind), loc(loc), message(message) {}
+
+    bool isWarning() const
+    { return kind == Warning; }
+
+    bool isError() const
+    { return kind == Error; }
+
+    Kind kind;
+    AST::SourceLocation loc;
+    QString message;
+};
+
+class QML_PARSER_EXPORT Engine
+{
+    Lexer *_lexer;
+    NodePool *_nodePool;
+    QSet<NameId> _literals;
+    QList<QDeclarativeJS::AST::SourceLocation> _comments;
+
+public:
+    Engine();
+    ~Engine();
+
+    QSet<NameId> literals() const;
+
+    void addComment(int pos, int len, int line, int col);
+    QList<QDeclarativeJS::AST::SourceLocation> comments() const;
+
+    NameId *intern(const QChar *u, int s);
+
+    static QString toString(NameId *id);
+
+    Lexer *lexer() const;
+    void setLexer(Lexer *lexer);
+
+    NodePool *nodePool() const;
+    void setNodePool(NodePool *nodePool);
+};
+
+} // end of namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif // QDECLARATIVEJSENGINE_P_H
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsglobal_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsglobal_p.h
new file mode 100644
index 0000000..776937c
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsglobal_p.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QDECLARATIVEJSGLOBAL_P_H
+#define QDECLARATIVEJSGLOBAL_P_H
+
+#include <QtCore/qglobal.h>
+
+#ifdef QT_CREATOR
+#  define QT_QML_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE
+
+#  ifdef QDECLARATIVEJS_BUILD_DIR
+#    define QML_PARSER_EXPORT Q_DECL_EXPORT
+#  elif QML_BUILD_STATIC_LIB
+#    define QML_PARSER_EXPORT
+#  else
+#    define QML_PARSER_EXPORT Q_DECL_IMPORT
+#  endif // QDECLARATIVEJS_BUILD_DIR
+
+#else // !QT_CREATOR
+#  define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
+#  define QT_QML_END_NAMESPACE QT_END_NAMESPACE
+#  define QML_PARSER_EXPORT
+#endif // QT_CREATOR
+
+#endif // QDECLARATIVEJSGLOBAL_P_H
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsgrammar.cpp b/tools/qdoc3/declarativeparser/qdeclarativejsgrammar.cpp
new file mode 100644
index 0000000..ea19e1c
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsgrammar.cpp
@@ -0,0 +1,989 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// This file was generated by qlalr - DO NOT EDIT!
+#include "qdeclarativejsgrammar_p.h"
+
+QT_BEGIN_NAMESPACE
+
+const char *const QDeclarativeJSGrammar::spell [] = {
+  "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", 
+  "default", "delete", "/", "/=", "do", ".", "else", "=", "==", "===", 
+  "finally", "for", "function", ">=", ">", ">>", ">>=", ">>>", ">>>=", "identifier", 
+  "if", "in", "instanceof", "{", "[", "<=", "(", "<", "<<", "<<=", 
+  "-", "-=", "--", "new", "!", "!=", "!==", "numeric literal", "|", "|=", 
+  "||", "+", "+=", "++", "?", "}", "]", "%", "%=", "return", 
+  ")", ";", 0, "*", "*=", "string literal", "property", "signal", "readonly", "switch", 
+  "this", "throw", "~", "try", "typeof", "var", "void", "while", "with", "^", 
+  "^=", "null", "true", "false", "const", "debugger", "reserved word", "multiline string literal", "comment", "public", 
+  "import", "as", "on", 0, 0, 0, 0, 0, 0, 0, 
+  0};
+
+const short QDeclarativeJSGrammar::lhs [] = {
+  101, 101, 101, 101, 101, 101, 102, 108, 108, 111, 
+  111, 113, 112, 112, 112, 112, 112, 112, 112, 112, 
+  115, 110, 109, 118, 118, 119, 119, 120, 120, 117, 
+  106, 106, 106, 106, 106, 106, 106, 106, 126, 126, 
+  126, 127, 127, 128, 128, 106, 106, 106, 106, 106, 
+  106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 
+  106, 106, 106, 106, 106, 116, 116, 116, 116, 116, 
+  131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 
+  131, 131, 131, 131, 131, 131, 131, 131, 121, 133, 
+  133, 133, 133, 132, 132, 135, 135, 137, 137, 137, 
+  137, 137, 137, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 
+  138, 138, 138, 138, 139, 139, 114, 114, 114, 114, 
+  114, 142, 142, 143, 143, 143, 143, 141, 141, 144, 
+  144, 145, 145, 146, 146, 146, 147, 147, 147, 147, 
+  147, 147, 147, 147, 147, 147, 148, 148, 148, 148, 
+  149, 149, 149, 150, 150, 150, 150, 151, 151, 151, 
+  151, 151, 151, 151, 152, 152, 152, 152, 152, 152, 
+  153, 153, 153, 153, 153, 154, 154, 154, 154, 154, 
+  155, 155, 156, 156, 157, 157, 158, 158, 159, 159, 
+  160, 160, 161, 161, 162, 162, 163, 163, 164, 164, 
+  165, 165, 166, 166, 136, 136, 167, 167, 168, 168, 
+  168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 
+  104, 104, 169, 169, 170, 170, 171, 171, 103, 103, 
+  103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 
+  103, 103, 103, 122, 183, 183, 182, 182, 130, 130, 
+  184, 184, 185, 185, 187, 187, 186, 188, 191, 189, 
+  189, 192, 190, 190, 123, 124, 124, 125, 125, 172, 
+  172, 172, 172, 172, 172, 172, 173, 173, 173, 173, 
+  174, 174, 174, 174, 175, 175, 176, 178, 193, 193, 
+  196, 196, 194, 194, 197, 195, 177, 177, 177, 179, 
+  179, 180, 180, 180, 198, 199, 181, 181, 129, 140, 
+  203, 203, 200, 200, 201, 201, 204, 107, 205, 205, 
+  105, 105, 202, 202, 134, 134, 206};
+
+const short QDeclarativeJSGrammar::rhs [] = {
+  2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 
+  2, 1, 2, 2, 3, 3, 5, 5, 4, 4, 
+  2, 0, 1, 1, 2, 1, 3, 2, 3, 2, 
+  1, 5, 4, 4, 3, 3, 3, 3, 1, 1, 
+  1, 0, 1, 2, 4, 6, 6, 3, 3, 7, 
+  7, 4, 4, 5, 5, 6, 6, 7, 7, 7, 
+  7, 10, 6, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  2, 3, 3, 4, 5, 3, 4, 3, 1, 1, 
+  2, 3, 4, 1, 2, 3, 5, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 4, 3, 
+  5, 1, 2, 4, 4, 4, 3, 0, 1, 1, 
+  3, 1, 1, 1, 2, 2, 1, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 1, 3, 3, 3, 
+  1, 3, 3, 1, 3, 3, 3, 1, 3, 3, 
+  3, 3, 3, 3, 1, 3, 3, 3, 3, 3, 
+  1, 3, 3, 3, 3, 1, 3, 3, 3, 3, 
+  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
+  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 
+  1, 5, 1, 5, 1, 3, 1, 3, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 3, 0, 1, 1, 3, 0, 1, 1, 1, 
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  1, 1, 1, 3, 1, 2, 0, 1, 3, 3, 
+  1, 1, 1, 3, 1, 3, 2, 2, 2, 0, 
+  1, 2, 0, 1, 1, 2, 2, 7, 5, 7, 
+  7, 5, 9, 10, 7, 8, 2, 2, 3, 3, 
+  2, 2, 3, 3, 3, 3, 5, 5, 3, 5, 
+  1, 2, 0, 1, 4, 3, 3, 3, 3, 3, 
+  3, 3, 3, 4, 5, 2, 2, 2, 8, 8, 
+  1, 3, 0, 1, 0, 1, 1, 1, 1, 2, 
+  1, 1, 0, 1, 0, 1, 2};
+
+const short QDeclarativeJSGrammar::action_default [] = {
+  0, 0, 0, 0, 0, 0, 22, 0, 174, 241, 
+  205, 213, 209, 153, 225, 201, 3, 138, 72, 154, 
+  217, 221, 142, 171, 152, 157, 137, 191, 178, 0, 
+  79, 80, 75, 343, 66, 345, 0, 0, 0, 0, 
+  77, 0, 0, 73, 76, 70, 0, 0, 67, 69, 
+  68, 78, 71, 0, 74, 0, 0, 167, 0, 0, 
+  154, 173, 156, 155, 0, 0, 0, 169, 170, 168, 
+  172, 0, 202, 0, 0, 0, 0, 192, 0, 0, 
+  0, 0, 0, 0, 182, 0, 0, 0, 176, 177, 
+  175, 180, 184, 183, 181, 179, 194, 193, 195, 0, 
+  210, 0, 206, 0, 0, 148, 135, 147, 136, 104, 
+  105, 106, 131, 107, 132, 108, 109, 110, 111, 112, 
+  113, 114, 115, 116, 117, 118, 119, 120, 133, 121, 
+  122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 
+  0, 0, 146, 242, 149, 0, 150, 0, 151, 145, 
+  0, 238, 231, 229, 236, 237, 235, 234, 240, 233, 
+  232, 230, 239, 226, 0, 214, 0, 0, 218, 0, 
+  0, 222, 0, 0, 148, 140, 0, 139, 0, 144, 
+  158, 0, 344, 333, 334, 0, 331, 0, 332, 0, 
+  335, 249, 256, 255, 263, 251, 0, 252, 336, 0, 
+  342, 253, 254, 259, 257, 339, 337, 341, 260, 0, 
+  271, 0, 0, 0, 0, 343, 66, 0, 345, 67, 
+  243, 285, 68, 0, 0, 0, 272, 0, 0, 261, 
+  262, 0, 250, 258, 286, 287, 330, 340, 0, 301, 
+  302, 303, 304, 0, 297, 298, 299, 300, 327, 328, 
+  0, 0, 0, 0, 0, 290, 291, 247, 245, 207, 
+  215, 211, 227, 203, 248, 0, 154, 219, 223, 196, 
+  185, 0, 0, 204, 0, 0, 0, 0, 197, 0, 
+  0, 0, 0, 0, 189, 187, 190, 188, 186, 199, 
+  198, 200, 0, 212, 0, 208, 0, 246, 154, 0, 
+  228, 243, 244, 0, 243, 0, 0, 293, 0, 0, 
+  0, 295, 0, 216, 0, 0, 220, 0, 0, 224, 
+  283, 0, 275, 284, 278, 0, 282, 0, 243, 276, 
+  0, 243, 0, 0, 294, 0, 0, 0, 296, 344, 
+  333, 0, 0, 335, 0, 329, 0, 319, 0, 0, 
+  0, 289, 0, 288, 0, 346, 0, 103, 265, 268, 
+  0, 104, 271, 107, 132, 109, 110, 75, 114, 115, 
+  66, 116, 119, 73, 76, 67, 243, 68, 78, 122, 
+  71, 124, 74, 126, 127, 272, 129, 130, 134, 0, 
+  96, 0, 0, 98, 102, 100, 87, 99, 101, 0, 
+  97, 86, 266, 264, 142, 143, 148, 0, 141, 0, 
+  318, 0, 305, 306, 0, 317, 0, 0, 0, 308, 
+  313, 311, 314, 0, 0, 312, 313, 0, 309, 0, 
+  310, 267, 316, 0, 267, 315, 0, 320, 321, 0, 
+  267, 322, 323, 0, 0, 324, 0, 0, 0, 325, 
+  326, 160, 159, 0, 0, 0, 292, 0, 0, 0, 
+  307, 280, 273, 0, 281, 277, 0, 279, 269, 0, 
+  270, 274, 90, 0, 0, 94, 81, 0, 83, 92, 
+  0, 84, 93, 95, 85, 91, 82, 0, 88, 164, 
+  162, 166, 163, 161, 165, 6, 338, 4, 2, 64, 
+  89, 0, 0, 67, 69, 68, 31, 5, 0, 65, 
+  0, 41, 40, 39, 0, 0, 54, 0, 55, 0, 
+  60, 61, 0, 41, 0, 0, 0, 0, 0, 50, 
+  0, 51, 0, 0, 26, 0, 0, 62, 27, 0, 
+  30, 28, 24, 0, 29, 25, 0, 52, 0, 53, 
+  0, 142, 0, 56, 57, 63, 0, 0, 0, 0, 
+  0, 58, 59, 0, 48, 42, 49, 43, 0, 0, 
+  0, 0, 45, 0, 46, 47, 44, 0, 0, 35, 
+  36, 37, 38, 142, 267, 0, 0, 104, 271, 107, 
+  132, 109, 110, 75, 114, 115, 66, 116, 119, 73, 
+  76, 67, 243, 68, 78, 122, 71, 124, 74, 126, 
+  127, 272, 129, 130, 134, 0, 32, 33, 0, 34, 
+  8, 0, 10, 0, 9, 0, 1, 21, 12, 0, 
+  13, 0, 14, 0, 19, 20, 0, 15, 16, 0, 
+  17, 18, 11, 23, 7, 347};
+
+const short QDeclarativeJSGrammar::goto_default [] = {
+  7, 626, 207, 196, 205, 507, 495, 625, 644, 620, 
+  624, 622, 627, 22, 623, 18, 506, 543, 533, 540, 
+  535, 191, 195, 197, 201, 524, 568, 567, 200, 232, 
+  26, 474, 473, 356, 355, 9, 354, 357, 107, 17, 
+  145, 24, 13, 144, 19, 25, 57, 23, 8, 28, 
+  27, 269, 15, 263, 10, 259, 12, 261, 11, 260, 
+  20, 267, 21, 268, 14, 262, 258, 299, 411, 264, 
+  265, 202, 193, 192, 204, 233, 203, 208, 229, 230, 
+  194, 360, 359, 231, 463, 462, 321, 322, 465, 324, 
+  464, 323, 419, 423, 426, 422, 421, 441, 442, 185, 
+  199, 181, 184, 198, 206, 0};
+
+const short QDeclarativeJSGrammar::action_index [] = {
+  421, 1288, 2322, 2322, 2419, 1016, -52, 37, 140, -101, 
+  35, -13, -40, 190, -101, 272, 34, -101, -101, 658, 
+  42, 103, 194, 201, -101, -101, -101, 439, 256, 1288, 
+  -101, -101, -101, 282, -101, 2128, 1751, 1288, 1288, 1288, 
+  -101, 917, 1288, -101, -101, -101, 1288, 1288, -101, -101, 
+  -101, -101, -101, 1288, -101, 1288, 1288, -101, 1288, 1288, 
+  109, 245, -101, -101, 1288, 1288, 1288, -101, -101, -101, 
+  185, 1288, 295, 1288, 1288, 1288, 1288, 461, 1288, 1288, 
+  1288, 1288, 1288, 1288, 256, 1288, 1288, 1288, 155, 119, 
+  114, 176, 256, 332, 202, 332, 560, 560, 471, 1288, 
+  -23, 1288, 53, 2031, 1288, 1288, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  100, 1288, -101, -101, 70, 59, -101, 1288, -101, -101, 
+  1288, -101, -101, -101, -101, -101, -101, -101, -101, -101, 
+  -101, -101, -101, -101, 1288, 41, 1288, 1288, 98, 91, 
+  1288, -101, 2031, 1288, 1288, -101, 121, -101, 73, -101, 
+  -101, 39, -101, 385, 180, 78, -101, 391, -101, 64, 
+  2322, -101, -101, -101, -101, -101, 208, -101, -101, 82, 
+  -101, -101, -101, -101, -101, -101, 2322, -101, -101, 538, 
+  -101, 495, 128, 2419, 54, 358, 62, 44, 2613, 67, 
+  1288, -101, 76, 63, 1288, 58, -101, 60, 46, -101, 
+  -101, 309, -101, -101, -101, -101, -101, -101, 86, -101, 
+  -101, -101, -101, 107, -101, -101, -101, -101, -101, -101, 
+  28, 52, 1288, 101, 102, -101, -101, 1472, -101, 83, 
+  75, 79, -101, 287, 84, 80, 585, 69, 89, 321, 
+  177, 482, 1288, 297, 1288, 1288, 1288, 1288, 331, 1288, 
+  1288, 1288, 1288, 1288, 332, 222, 332, 332, 332, 410, 
+  410, 410, 1288, 57, 1288, 72, 1288, -101, 658, 1288, 
+  -101, 1288, 71, 45, 1288, 61, 2419, -101, 1288, 132, 
+  2419, -101, 1288, 47, 1288, 1288, 66, 65, 1288, -101, 
+  68, 112, 81, -101, -101, 1288, -101, 369, 1288, -101, 
+  85, 1288, 74, 2419, -101, 1288, 122, 2419, -101, 77, 
+  294, 16, -29, 2322, -53, -101, 2419, -101, 1288, 127, 
+  2419, -15, 2419, -101, 10, 11, -34, -101, -101, 2419, 
+  -48, 504, 4, 476, 113, 1288, 2419, 2, -28, 420, 
+  6, -21, 719, 7, 87, -101, 1382, -101, -4, -16, 
+  5, 1288, 3, -27, 1288, 9, 1288, -18, -31, 1288, 
+  -101, 2225, -7, -101, -101, -101, -101, -101, -101, 1288, 
+  -101, -101, -101, -101, 246, -101, 1288, -38, -101, 2419, 
+  -101, 88, -101, -101, 2419, -101, 1288, 106, 26, -101, 
+  55, -101, 50, 105, 1288, -101, 48, 38, -101, -8, 
+  -101, 2419, -101, 94, 2419, -101, 238, -101, -101, 104, 
+  2419, 31, -101, 21, 19, -101, 305, 1, 30, -101, 
+  -101, -101, -101, 1288, 136, 2419, -101, 1288, 134, 2419, 
+  -101, 49, -101, 173, -101, -101, 1288, -101, -101, 363, 
+  -101, -101, -101, 137, 1565, -101, -101, 1658, -101, -101, 
+  1844, -101, -101, -101, -101, -101, -101, 95, -101, -101, 
+  -101, -101, -101, -101, -101, -101, 2322, -101, -101, -101, 
+  92, 15, 925, 169, 27, -6, -101, -101, 212, -101, 
+  191, -101, -101, -101, 323, 211, -101, 1288, -101, 214, 
+  -101, -101, 216, 40, 317, 210, 43, 259, 236, -101, 
+  36, -101, 747, 96, -101, 29, 747, -101, -101, 1198, 
+  -101, -101, -101, 1107, -101, -101, 231, -101, 1288, -101, 
+  217, 286, 32, -101, -101, -101, 188, 340, 51, 1288, 
+  175, -101, -101, 171, -101, 179, -101, 56, -11, 351, 
+  181, 336, -101, 110, -101, -101, -101, 1934, 647, -101, 
+  -101, -101, -101, 253, 2516, 1751, -5, 460, 22, 468, 
+  138, 1288, 2419, 24, -2, 412, 23, -3, 836, 20, 
+  87, -101, 1382, -101, 17, -10, 18, 1288, 25, 8, 
+  1288, 33, 1288, 12, 14, 120, -101, -101, 13, -101, 
+  -101, 747, -101, 248, -47, 828, -101, -101, 152, 482, 
+  -101, 150, -101, 123, -101, -101, 398, -101, -101, 117, 
+  -101, -101, -101, -101, -101, -101, 
+
+  -106, 6, -92, 10, 5, 278, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -42, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 109, 
+  -106, -106, -106, -10, -106, -106, -35, 24, 73, 90, 
+  -106, 219, 181, -106, -106, -106, 171, 120, -106, -106, 
+  -106, -106, -106, 174, -106, 170, 167, -106, 175, 163, 
+  -106, -106, -106, -106, 184, 177, 180, -106, -106, -106, 
+  -106, 125, -106, 132, 134, 162, 130, -106, 121, 124, 
+  123, 141, 142, 152, -106, 154, 161, 160, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, 139, 
+  -106, 143, -106, 156, 91, 55, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 32, -106, -106, -106, -106, -106, 33, -106, -106, 
+  26, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, 96, -106, 119, 52, -106, -106, 
+  66, -106, 220, 69, 71, -106, -106, -106, -106, -106, 
+  -106, -106, -106, 25, -106, -106, -106, 64, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 70, -106, -106, 61, 
+  -106, 41, -106, 39, -106, 37, -106, -106, 42, -106, 
+  79, -106, -106, -106, 81, 72, -106, -106, -106, -106, 
+  -106, -5, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 21, -106, -106, -106, -106, 112, -106, -106, 
+  -106, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, 17, 237, -106, 192, 236, 224, 225, -106, 97, 
+  98, 101, 99, 113, -106, -106, -106, -106, -106, -106, 
+  -106, -106, 204, -106, 223, -106, 235, -106, -106, 239, 
+  -106, 197, -106, -106, 228, -106, 27, -106, 13, -106, 
+  2, -106, 233, -106, 190, 198, -106, -106, 196, -106, 
+  -106, -106, -106, -106, -106, 200, -106, 107, 135, -106, 
+  -106, 186, -106, 84, -106, 80, -106, 76, -106, -106, 
+  89, -106, -106, -49, -106, -106, 47, -106, 40, -106, 
+  44, -106, 68, -106, -106, -106, -106, -106, -106, 53, 
+  -106, 35, -106, 49, -106, 87, 63, -106, -106, 30, 
+  -106, -106, 103, -106, -106, -106, 51, -106, -106, -106, 
+  -106, 86, -106, 67, 114, -106, 74, -106, -106, 65, 
+  -106, 56, -106, -106, -106, -106, -106, -106, -106, 62, 
+  -106, -106, -106, -106, -106, -106, 95, -106, -106, 78, 
+  -106, -106, -106, -106, 75, -106, 88, -106, -106, -106, 
+  -106, -106, -54, -106, 45, -106, -40, -106, -106, -106, 
+  -106, 94, -106, -106, 100, -106, -106, -106, -106, -106, 
+  150, -41, -106, -106, 54, -106, 43, -106, 48, -106, 
+  -106, -106, -106, 59, -106, 57, -106, 60, -106, 58, 
+  -106, -106, -106, -106, -106, -106, 38, -106, -106, 144, 
+  -106, -106, -106, -106, 31, -106, -106, 202, -106, -106, 
+  50, -106, -106, -106, -106, -106, -106, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106, 77, -106, -106, -106, 
+  -106, -106, 82, -106, -106, -106, -106, -106, -106, -106, 
+  -17, -106, -106, -106, -4, -106, -106, 12, -106, -106, 
+  -106, -106, -106, -106, -14, 46, -106, -13, -106, -106, 
+  -106, -106, 108, -106, -106, -106, 243, -106, -106, 295, 
+  -106, -106, -106, 290, -106, -106, -106, -106, 346, -106, 
+  -106, -106, 16, -106, -106, -106, 22, 23, -106, 34, 
+  -106, -106, -106, -106, -106, 11, -106, -106, -106, 7, 
+  1, 8, -106, -106, -106, -106, -106, 307, 179, -106, 
+  -106, -106, -106, -106, 18, 281, 9, 15, -106, 4, 
+  -106, 83, 29, -106, -106, -2, -106, -106, 85, -106, 
+  -106, -106, 3, -106, -106, -106, -106, 14, -106, 0, 
+  105, -106, 93, -106, -106, -106, -106, -106, -1, -106, 
+  -106, 20, -106, -106, 28, 92, -106, -106, -106, 19, 
+  -106, -106, -106, -106, -106, -106, -12, -106, -106, -106, 
+  -106, -106, -106, -106, -106, -106};
+
+const short QDeclarativeJSGrammar::action_info [] = {
+  399, 352, 345, -101, 343, 457, 440, 403, 257, -112, 
+  -125, -131, -123, 346, -120, 348, -128, 389, 453, 391, 
+  416, 401, 408, 563, -101, -123, 416, -120, 539, -131, 
+  346, -112, -125, 348, 257, 99, 71, 645, 621, 101, 
+  -128, 440, 141, 621, 164, 431, 539, 430, 453, 573, 
+  457, 444, 440, 424, 71, 424, 101, 446, 559, 420, 
+  424, 448, 539, 440, 570, 539, 466, 527, 312, 346, 
+  532, 312, 318, 272, 409, 183, 342, 525, 147, 141, 
+  348, 510, 457, 414, 272, 325, 0, 0, 252, 99, 
+  257, 440, 296, 556, -102, 292, 453, 190, 170, 416, 
+  164, 434, 141, 141, 536, 251, 304, 172, 141, 141, 
+  443, 0, 335, 340, 141, 427, 0, 0, 0, 149, 
+  327, 306, 0, 292, 444, 0, 173, 0, 536, 141, 
+  141, 0, 0, 179, 333, 141, 294, 236, 189, 314, 
+  141, 301, 141, 315, 141, 477, 331, 242, 241, 413, 
+  412, 62, 537, 166, 58, 488, 142, 167, 294, 58, 
+  428, 254, 63, 256, 255, 59, 418, 172, 247, 246, 
+  59, 575, 574, 328, 249, 248, 616, 177, 641, 640, 
+  58, 469, 337, 141, 635, 634, 173, 350, 187, 249, 
+  248, 59, 310, 478, 459, 58, 455, 64, 523, 249, 
+  248, 85, 85, 86, 86, 103, 59, 565, 511, 172, 
+  511, 638, 637, 64, 87, 87, 141, 511, 517, 577, 
+  511, 0, 141, 0, 104, 141, 105, 85, 173, 86, 
+  174, 172, 566, 564, 470, 468, 562, 561, 548, 511, 
+  87, 636, 65, 530, 513, 539, 141, 85, 66, 86, 
+  173, 0, 406, 0, 513, 512, 513, 64, 65, 0, 
+  87, 172, 0, 513, 66, 512, 513, 512, 172, 235, 
+  234, 0, 518, 516, 512, 521, 520, 512, 554, 553, 
+  173, 85, 406, 86, 0, 513, -89, 173, 34, 174, 
+  73, 74, 549, 547, 87, 631, 512, 531, 529, 438, 
+  437, 172, 65, 0, 578, 274, 275, 0, 66, 632, 
+  630, 34, 0, 73, 74, 274, 275, 75, 76, -89, 
+  173, 0, 174, 34, 0, 48, 50, 49, 0, 0, 
+  0, 0, 276, 277, 34, 0, 0, 0, 34, 629, 
+  75, 76, 276, 277, 279, 280, 34, 0, 48, 50, 
+  49, 45, 34, 281, 279, 280, 282, 85, 283, 86, 
+  48, 50, 49, 281, 0, 34, 282, 0, 283, 34, 
+  87, 48, 50, 49, 45, 48, 50, 49, 0, 0, 
+  34, 0, 0, 48, 50, 49, 45, 34, 0, 48, 
+  50, 49, 34, 0, 0, 0, 0, 45, 34, 0, 
+  0, 45, 48, 50, 49, 0, 48, 50, 49, 45, 
+  0, 0, 0, 0, 34, 45, 0, 48, 50, 49, 
+  34, 0, 0, 0, 48, 50, 49, 34, 45, 48, 
+  50, 49, 45, 279, 280, 48, 50, 49, 0, 0, 
+  0, 34, 281, 45, 0, 282, 0, 283, -343, 34, 
+  45, 48, 50, 49, 0, 45, -343, 48, 50, 49, 
+  0, 45, 78, 79, 48, 50, 49, 0, 0, 0, 
+  80, 81, 0, 0, 82, 0, 83, 45, 48, 50, 
+  49, 0, 0, 45, 78, 79, 48, 50, 49, 34, 
+  45, 0, 80, 81, 78, 79, 82, 34, 83, 0, 
+  0, 0, 80, 81, 45, 34, 82, 0, 83, 0, 
+  0, 34, 45, 0, 6, 5, 4, 1, 3, 2, 
+  0, 240, 239, 0, 34, 0, 48, 50, 49, 245, 
+  244, 0, 0, 34, 48, 50, 49, 245, 244, 0, 
+  0, 0, 48, 50, 49, 0, 0, 0, 48, 50, 
+  49, 0, 45, 0, 0, 0, 245, 244, 0, 0, 
+  45, 48, 50, 49, 0, 240, 239, 34, 45, 0, 
+  48, 50, 49, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 78, 79, 0, 0, 45, 151, 0, 
+  0, 80, 81, 0, 0, 82, 45, 83, 152, 240, 
+  239, 0, 153, 0, 48, 50, 49, 0, 0, 0, 
+  0, 154, 0, 155, 0, 0, 308, 0, 0, 0, 
+  0, 0, 0, 0, 156, 0, 157, 62, 0, 0, 
+  45, 0, 0, 0, 158, 0, 0, 159, 63, 0, 
+  0, 0, 0, 160, 0, 0, 0, 0, 0, 161, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 
+  31, 151, 0, 0, 0, 162, 0, 0, 0, 33, 
+  0, 152, 0, 0, 0, 153, 34, 0, 0, 0, 
+  35, 36, 0, 37, 154, 0, 155, 0, 0, 0, 
+  502, 0, 0, 0, 44, 0, 0, 156, 0, 157, 
+  62, 0, 0, 0, 0, 0, 0, 158, 0, 0, 
+  159, 63, 51, 48, 50, 49, 160, 52, 0, 0, 
+  0, 0, 161, 0, 0, 0, 0, 0, 43, 54, 
+  32, 30, 31, 0, 40, 0, 0, 0, 162, 45, 
+  0, 33, 0, 0, 0, 0, 0, 0, 34, 0, 
+  0, 0, 35, 36, 0, 37, 0, 0, 0, 30, 
+  31, 0, 41, 0, 0, 0, 44, 0, 0, 33, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 51, 48, 50, 49, 0, 52, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
+  43, 54, 32, 0, 0, 0, 40, 0, 0, 0, 
+  0, 45, 51, 48, 50, 49, 0, 52, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 0, 0, 0, 45, 
+  30, 31, 0, 0, 0, 0, 0, 0, 30, 31, 
+  33, 0, 0, 0, 0, 0, 0, 34, 33, 0, 
+  0, 35, 36, 0, 37, 34, 0, 0, 0, 35, 
+  36, 502, 37, 0, 0, 44, 0, 0, 0, 41, 
+  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
+  0, 51, 48, 50, 49, 0, 52, 0, 0, 43, 
+  54, 32, 0, 0, 0, 40, 0, 43, 54, 32, 
+  45, 0, 0, 40, 0, 0, 0, 0, 45, 30, 
+  31, 0, 0, 0, 0, 0, 0, 30, 31, 33, 
+  0, 0, 0, 0, 0, 0, 34, 33, 0, 0, 
+  35, 36, 0, 37, 34, 0, 0, 0, 35, 36, 
+  41, 37, 0, 0, 44, 0, 0, 0, 502, 0, 
+  0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 48, 50, 49, 0, 52, 0, 0, 
+  51, 48, 50, 49, 0, 52, 0, 0, 43, 54, 
+  32, 0, 0, 0, 40, 0, 43, 54, 32, 45, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 501, 0, 30, 31, 
+  0, 0, 0, 0, 0, 0, 0, 0, 215, 0, 
+  0, 0, 0, 0, 0, 34, 0, 0, 0, 35, 
+  36, 0, 37, 0, 0, 0, 0, 0, 0, 502, 
+  0, 0, 0, 44, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 51, 503, 505, 504, 0, 52, 0, 0, 0, 
+  0, 226, 0, 0, 0, 0, 0, 43, 54, 32, 
+  210, 0, 0, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 501, 0, 30, 
+  31, 0, 0, 0, 0, 0, 0, 0, 0, 215, 
+  0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 
+  35, 36, 0, 37, 0, 0, 0, 0, 0, 0, 
+  502, 0, 0, 0, 44, 0, 0, 0, 0, 0, 
+  0, 0, 544, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 51, 503, 505, 504, 0, 52, 0, 0, 
+  0, 0, 226, 0, 0, 0, 0, 0, 43, 54, 
+  32, 210, 0, 0, 40, 0, 0, 0, 0, 45, 
+  0, 0, 0, 0, 0, 0, 0, 0, 501, 0, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  215, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 0, 0, 
+  0, 502, 0, 0, 0, 44, 0, 0, 0, 0, 
+  0, 0, 0, 541, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 51, 503, 505, 504, 0, 52, 0, 
+  0, 0, 0, 226, 0, 0, 0, 0, 0, 43, 
+  54, 32, 210, 0, 0, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 29, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
+  53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
+  54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, -121, 
+  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
+  49, 0, 52, 0, 53, 0, 55, 0, 56, 0, 
+  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 29, 30, 31, 0, 0, 0, 0, 
+  0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 
+  0, 34, 0, 0, 0, 35, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 51, 48, 50, 
+  49, 0, 52, 0, 53, 0, 55, 271, 56, 0, 
+  0, 0, 0, 43, 54, 32, 0, 0, 0, 40, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 483, 0, 0, 29, 30, 31, 0, 
+  0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 
+  0, 0, 0, 0, 34, 0, 0, 0, 35, 36, 
+  0, 37, 0, 0, 0, 38, 0, 39, 41, 42, 
+  0, 0, 44, 0, 0, 0, 46, 0, 47, 0, 
+  0, 486, 0, 0, 0, 0, 0, 0, 0, 0, 
+  51, 48, 50, 49, 0, 52, 0, 53, 0, 55, 
+  0, 56, 0, 0, 0, 0, 43, 54, 32, 0, 
+  0, 0, 40, 0, 0, 0, 0, 45, 0, 0, 
+  0, 0, 0, 0, 0, 0, 475, 0, 0, 29, 
+  30, 31, 0, 0, 0, 0, 0, 0, 0, 0, 
+  33, 0, 0, 0, 0, 0, 0, 34, 0, 0, 
+  0, 35, 36, 0, 37, 0, 0, 0, 38, 0, 
+  39, 41, 42, 0, 0, 44, 0, 0, 0, 46, 
+  0, 47, 0, 0, 481, 0, 0, 0, 0, 0, 
+  0, 0, 0, 51, 48, 50, 49, 0, 52, 0, 
+  53, 0, 55, 0, 56, 0, 0, 0, 0, 43, 
+  54, 32, 0, 0, 0, 40, 0, 0, 0, 0, 
+  45, 0, 0, 0, 0, 0, 0, 0, 0, 475, 
+  0, 0, 29, 30, 31, 0, 0, 0, 0, 0, 
+  0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 
+  34, 0, 0, 0, 35, 36, 0, 37, 0, 0, 
+  0, 38, 0, 39, 41, 42, 0, 0, 44, 0, 
+  0, 0, 46, 0, 47, 0, 0, 476, 0, 0, 
+  0, 0, 0, 0, 0, 0, 51, 48, 50, 49, 
+  0, 52, 0, 53, 0, 55, 0, 56, 0, 0, 
+  0, 0, 43, 54, 32, 0, 0, 0, 40, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 483, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 0, 0, 0, 35, 36, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  484, 0, 0, 0, 0, 0, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
+  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 29, 30, 31, 0, 0, 
+  0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 
+  0, 0, 0, 34, 217, 0, 0, 584, 585, 0, 
+  37, 0, 0, 0, 38, 0, 39, 41, 42, 0, 
+  0, 44, 0, 0, 0, 46, 0, 47, 0, 0, 
+  0, 0, 0, 0, 0, 221, 0, 0, 0, 51, 
+  48, 50, 49, 0, 52, 0, 53, 0, 55, 0, 
+  56, 0, 0, 0, 0, 43, 54, 32, 0, 0, 
+  0, 40, 0, 0, 0, 0, 45, 0, 0, 0, 
+  0, 0, 0, 0, 0, 109, 110, 111, 0, 0, 
+  113, 115, 116, 0, 0, 117, 0, 118, 0, 0, 
+  0, 120, 121, 122, 0, 0, 0, 0, 0, 0, 
+  34, 123, 124, 125, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 126, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  129, 0, 0, 0, 0, 0, 0, 48, 50, 49, 
+  130, 131, 132, 0, 134, 135, 136, 137, 138, 139, 
+  0, 0, 127, 133, 119, 112, 114, 128, 0, 0, 
+  0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 
+  0, 0, 109, 110, 111, 0, 0, 113, 115, 116, 
+  0, 0, 117, 0, 118, 0, 0, 0, 120, 121, 
+  122, 0, 0, 0, 0, 0, 0, 393, 123, 124, 
+  125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 126, 0, 0, 0, 394, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 129, 0, 0, 
+  0, 0, 0, 398, 395, 397, 0, 130, 131, 132, 
+  0, 134, 135, 136, 137, 138, 139, 0, 0, 127, 
+  133, 119, 112, 114, 128, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 
+  110, 111, 0, 0, 113, 115, 116, 0, 0, 117, 
+  0, 118, 0, 0, 0, 120, 121, 122, 0, 0, 
+  0, 0, 0, 0, 393, 123, 124, 125, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 
+  0, 0, 394, 0, 0, 0, 0, 0, 0, 0, 
+  396, 0, 0, 0, 129, 0, 0, 0, 0, 0, 
+  398, 395, 397, 0, 130, 131, 132, 0, 134, 135, 
+  136, 137, 138, 139, 0, 0, 127, 133, 119, 112, 
+  114, 128, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 209, 0, 0, 0, 
+  0, 211, 0, 29, 30, 31, 213, 0, 0, 0, 
+  0, 0, 0, 214, 215, 0, 0, 0, 0, 0, 
+  0, 216, 217, 0, 0, 218, 36, 0, 37, 0, 
+  0, 0, 38, 0, 39, 41, 42, 0, 0, 44, 
+  0, 0, 0, 46, 0, 47, 0, 0, 0, 0, 
+  0, 220, 0, 221, 0, 0, 0, 51, 219, 222, 
+  49, 223, 52, 224, 53, 225, 55, 226, 56, 227, 
+  228, 0, 0, 43, 54, 32, 210, 212, 0, 40, 
+  0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 
+  0, 0, 0, 209, 0, 0, 0, 0, 211, 0, 
+  29, 30, 31, 213, 0, 0, 0, 0, 0, 0, 
+  214, 33, 0, 0, 0, 0, 0, 0, 216, 217, 
+  0, 0, 218, 36, 0, 37, 0, 0, 0, 38, 
+  0, 39, 41, 42, 0, 0, 44, 0, 0, 0, 
+  46, 0, 47, 0, 0, 0, 0, 0, 220, 0, 
+  221, 0, 0, 0, 51, 219, 222, 49, 223, 52, 
+  224, 53, 225, 55, 226, 56, 227, 228, 0, 0, 
+  43, 54, 32, 210, 212, 0, 40, 0, 0, 0, 
+  0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 
+  587, 110, 111, 0, 0, 589, 115, 591, 30, 31, 
+  592, 0, 118, 0, 0, 0, 120, 594, 595, 0, 
+  0, 0, 0, 0, 0, 596, 597, 124, 125, 218, 
+  36, 0, 37, 0, 0, 0, 38, 0, 39, 598, 
+  42, 0, 0, 600, 0, 0, 0, 46, 0, 47, 
+  0, 0, 0, 0, 0, 602, 0, 221, 0, 0, 
+  0, 604, 601, 603, 49, 605, 606, 607, 53, 609, 
+  610, 611, 612, 613, 614, 0, 0, 599, 608, 593, 
+  588, 590, 128, 40, 0, 0, 0, 0, 45, 0, 
+  0, 0, 0, 0, 0, 0, 0, 361, 110, 111, 
+  0, 0, 363, 115, 365, 30, 31, 366, 0, 118, 
+  0, 0, 0, 120, 368, 369, 0, 0, 0, 0, 
+  0, 0, 370, 371, 124, 125, 218, 36, 0, 37, 
+  0, 0, 0, 38, 0, 39, 372, 42, 0, 0, 
+  374, 0, 0, 0, 46, 0, 47, 0, -267, 0, 
+  0, 0, 376, 0, 221, 0, 0, 0, 378, 375, 
+  377, 49, 379, 380, 381, 53, 383, 384, 385, 386, 
+  387, 388, 0, 0, 373, 382, 367, 362, 364, 128, 
+  40, 0, 0, 0, 0, 45, 0, 0, 0, 0, 
+  0, 0, 0, 0, 
+
+  472, 546, 528, 639, 311, 182, 302, 498, 514, 16, 
+  461, 515, 496, 182, 497, 519, 309, 436, 619, 243, 
+  358, 439, 576, 572, 253, 150, 571, 487, 617, 307, 
+  238, 250, 320, 628, 633, 555, 569, 560, 558, 642, 
+  186, 250, 425, 349, 358, 182, 351, 557, 433, 347, 
+  238, 344, 339, 429, 302, 402, 243, 445, 447, 456, 
+  460, 163, 454, 458, 243, 250, 485, 143, 148, 449, 
+  353, 526, 176, 467, 237, 450, 238, 415, 338, 188, 
+  410, 237, 302, 336, 436, 482, 334, 169, 439, 436, 
+  146, 417, 392, 439, 140, 522, 358, 400, 404, 0, 
+  390, 171, 358, 0, 186, 500, 146, 0, 643, 0, 
+  0, 178, 0, 0, 0, 0, 404, 60, 60, 489, 
+  452, 500, 320, 0, 534, 0, 405, 60, 0, 180, 
+  146, 60, 0, 180, 60, 407, 490, 60, 302, 452, 
+  60, 60, 60, 60, 405, 60, 284, 285, 287, 60, 
+  286, 451, 358, 60, 165, 180, 266, 60, 60, 461, 
+  451, 270, 288, 60, 60, 60, 493, 60, 60, 60, 
+  84, 106, 92, 91, 60, 432, 60, 72, 60, 168, 
+  98, 435, 77, 60, 96, 60, 60, 60, 341, 302, 
+  93, 94, 500, 108, 329, 100, 60, 102, 60, 618, 
+  302, 95, 88, 330, 60, 60, 60, 60, 90, 89, 
+  70, 60, 97, 452, 60, 60, 451, 492, 60, 60, 
+  494, 60, 61, 68, 60, 60, 69, 491, 60, 471, 
+  67, 302, 404, 480, 60, 106, 60, 479, 0, 270, 
+  298, 270, 298, 278, 298, 270, 0, 270, 60, 270, 
+  0, 316, 0, 270, 332, 0, 500, 108, 175, 538, 
+  405, 293, 319, 0, 317, 303, 326, 60, 60, 60, 
+  0, 0, 270, 270, 270, 290, 291, 60, 295, 298, 
+  60, 60, 270, 298, 270, 270, 270, 289, 270, 0, 
+  273, 500, 313, 0, 551, 545, 305, 534, 508, 615, 
+  542, 297, 0, 500, 0, 300, 499, 509, 500, 0, 
+  508, 0, 0, 0, 0, 508, 472, 0, 499, 509, 
+  583, 0, 0, 499, 509, 0, 0, 586, 579, 580, 
+  581, 582, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 550, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 551, 
+  0, 0, 0, 0, 0, 0, 552, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0};
+
+const short QDeclarativeJSGrammar::action_check [] = {
+  7, 16, 55, 7, 33, 36, 33, 55, 36, 7, 
+  7, 7, 7, 7, 7, 36, 7, 7, 36, 8, 
+  36, 55, 60, 29, 7, 7, 36, 7, 33, 7, 
+  7, 7, 7, 36, 36, 48, 1, 0, 90, 79, 
+  7, 33, 8, 90, 2, 7, 33, 55, 36, 60, 
+  36, 20, 33, 5, 1, 5, 79, 36, 7, 33, 
+  5, 60, 33, 33, 8, 33, 17, 24, 2, 7, 
+  34, 2, 7, 1, 7, 36, 60, 37, 8, 8, 
+  36, 66, 36, 7, 1, 17, -1, -1, 36, 48, 
+  36, 33, 8, 66, 7, 48, 36, 33, 7, 36, 
+  2, 7, 8, 8, 8, 77, 61, 15, 8, 8, 
+  6, -1, 31, 36, 8, 10, -1, -1, -1, 60, 
+  8, 60, -1, 48, 20, -1, 34, -1, 8, 8, 
+  8, -1, -1, 60, 60, 8, 79, 55, 60, 50, 
+  8, 61, 8, 54, 8, 8, 61, 61, 62, 61, 
+  62, 42, 56, 50, 40, 60, 56, 54, 79, 40, 
+  55, 60, 53, 61, 62, 51, 60, 15, 61, 62, 
+  51, 61, 62, 61, 61, 62, 56, 56, 61, 62, 
+  40, 8, 60, 8, 61, 62, 34, 60, 8, 61, 
+  62, 51, 60, 56, 60, 40, 60, 12, 29, 61, 
+  62, 25, 25, 27, 27, 15, 51, 36, 29, 15, 
+  29, 61, 62, 12, 38, 38, 8, 29, 7, 7, 
+  29, -1, 8, -1, 34, 8, 36, 25, 34, 27, 
+  36, 15, 61, 62, 61, 62, 61, 62, 7, 29, 
+  38, 91, 57, 7, 75, 33, 8, 25, 63, 27, 
+  34, -1, 36, -1, 75, 86, 75, 12, 57, -1, 
+  38, 15, -1, 75, 63, 86, 75, 86, 15, 61, 
+  62, -1, 61, 62, 86, 61, 62, 86, 61, 62, 
+  34, 25, 36, 27, -1, 75, 33, 34, 29, 36, 
+  18, 19, 61, 62, 38, 47, 86, 61, 62, 61, 
+  62, 15, 57, -1, 92, 18, 19, -1, 63, 61, 
+  62, 29, -1, 18, 19, 18, 19, 45, 46, 33, 
+  34, -1, 36, 29, -1, 66, 67, 68, -1, -1, 
+  -1, -1, 45, 46, 29, -1, -1, -1, 29, 91, 
+  45, 46, 45, 46, 23, 24, 29, -1, 66, 67, 
+  68, 92, 29, 32, 23, 24, 35, 25, 37, 27, 
+  66, 67, 68, 32, -1, 29, 35, -1, 37, 29, 
+  38, 66, 67, 68, 92, 66, 67, 68, -1, -1, 
+  29, -1, -1, 66, 67, 68, 92, 29, -1, 66, 
+  67, 68, 29, -1, -1, -1, -1, 92, 29, -1, 
+  -1, 92, 66, 67, 68, -1, 66, 67, 68, 92, 
+  -1, -1, -1, -1, 29, 92, -1, 66, 67, 68, 
+  29, -1, -1, -1, 66, 67, 68, 29, 92, 66, 
+  67, 68, 92, 23, 24, 66, 67, 68, -1, -1, 
+  -1, 29, 32, 92, -1, 35, -1, 37, 36, 29, 
+  92, 66, 67, 68, -1, 92, 36, 66, 67, 68, 
+  -1, 92, 23, 24, 66, 67, 68, -1, -1, -1, 
+  31, 32, -1, -1, 35, -1, 37, 92, 66, 67, 
+  68, -1, -1, 92, 23, 24, 66, 67, 68, 29, 
+  92, -1, 31, 32, 23, 24, 35, 29, 37, -1, 
+  -1, -1, 31, 32, 92, 29, 35, -1, 37, -1, 
+  -1, 29, 92, -1, 93, 94, 95, 96, 97, 98, 
+  -1, 61, 62, -1, 29, -1, 66, 67, 68, 61, 
+  62, -1, -1, 29, 66, 67, 68, 61, 62, -1, 
+  -1, -1, 66, 67, 68, -1, -1, -1, 66, 67, 
+  68, -1, 92, -1, -1, -1, 61, 62, -1, -1, 
+  92, 66, 67, 68, -1, 61, 62, 29, 92, -1, 
+  66, 67, 68, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 23, 24, -1, -1, 92, 3, -1, 
+  -1, 31, 32, -1, -1, 35, 92, 37, 13, 61, 
+  62, -1, 17, -1, 66, 67, 68, -1, -1, -1, 
+  -1, 26, -1, 28, -1, -1, 31, -1, -1, -1, 
+  -1, -1, -1, -1, 39, -1, 41, 42, -1, -1, 
+  92, -1, -1, -1, 49, -1, -1, 52, 53, -1, 
+  -1, -1, -1, 58, -1, -1, -1, -1, -1, 64, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 12, 
+  13, 3, -1, -1, -1, 80, -1, -1, -1, 22, 
+  -1, 13, -1, -1, -1, 17, 29, -1, -1, -1, 
+  33, 34, -1, 36, 26, -1, 28, -1, -1, -1, 
+  43, -1, -1, -1, 47, -1, -1, 39, -1, 41, 
+  42, -1, -1, -1, -1, -1, -1, 49, -1, -1, 
+  52, 53, 65, 66, 67, 68, 58, 70, -1, -1, 
+  -1, -1, 64, -1, -1, -1, -1, -1, 81, 82, 
+  83, 12, 13, -1, 87, -1, -1, -1, 80, 92, 
+  -1, 22, -1, -1, -1, -1, -1, -1, 29, -1, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 12, 
+  13, -1, 43, -1, -1, -1, 47, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, 65, 66, 67, 68, -1, 70, 
+  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
+  81, 82, 83, -1, -1, -1, 87, -1, -1, -1, 
+  -1, 92, 65, 66, 67, 68, -1, 70, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, -1, -1, -1, 92, 
+  12, 13, -1, -1, -1, -1, -1, -1, 12, 13, 
+  22, -1, -1, -1, -1, -1, -1, 29, 22, -1, 
+  -1, 33, 34, -1, 36, 29, -1, -1, -1, 33, 
+  34, 43, 36, -1, -1, 47, -1, -1, -1, 43, 
+  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, 81, 82, 83, 
+  92, -1, -1, 87, -1, -1, -1, -1, 92, 12, 
+  13, -1, -1, -1, -1, -1, -1, 12, 13, 22, 
+  -1, -1, -1, -1, -1, -1, 29, 22, -1, -1, 
+  33, 34, -1, 36, 29, -1, -1, -1, 33, 34, 
+  43, 36, -1, -1, 47, -1, -1, -1, 43, -1, 
+  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
+  65, 66, 67, 68, -1, 70, -1, -1, 81, 82, 
+  83, -1, -1, -1, 87, -1, 81, 82, 83, 92, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 10, -1, 12, 13, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, 
+  -1, -1, -1, -1, -1, 29, -1, -1, -1, 33, 
+  34, -1, 36, -1, -1, -1, -1, -1, -1, 43, 
+  -1, -1, -1, 47, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 65, 66, 67, 68, -1, 70, -1, -1, -1, 
+  -1, 75, -1, -1, -1, -1, -1, 81, 82, 83, 
+  84, -1, -1, 87, -1, -1, -1, -1, 92, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 10, -1, 12, 
+  13, -1, -1, -1, -1, -1, -1, -1, -1, 22, 
+  -1, -1, -1, -1, -1, -1, 29, -1, -1, -1, 
+  33, 34, -1, 36, -1, -1, -1, -1, -1, -1, 
+  43, -1, -1, -1, 47, -1, -1, -1, -1, -1, 
+  -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 65, 66, 67, 68, -1, 70, -1, -1, 
+  -1, -1, 75, -1, -1, -1, -1, -1, 81, 82, 
+  83, 84, -1, -1, 87, -1, -1, -1, -1, 92, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 10, -1, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
+  -1, -1, -1, 55, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  -1, -1, -1, 75, -1, -1, -1, -1, -1, 81, 
+  82, 83, 84, -1, -1, 87, -1, -1, -1, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, -1, 11, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
+  -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, -1, 7, 
+  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, -1, 70, -1, 72, -1, 74, -1, 76, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 11, 12, 13, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, 
+  -1, 29, -1, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 65, 66, 67, 
+  68, -1, 70, -1, 72, -1, 74, 75, 76, -1, 
+  -1, -1, -1, 81, 82, 83, -1, -1, -1, 87, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 8, -1, -1, 11, 12, 13, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, 
+  -1, -1, -1, -1, 29, -1, -1, -1, 33, 34, 
+  -1, 36, -1, -1, -1, 40, -1, 42, 43, 44, 
+  -1, -1, 47, -1, -1, -1, 51, -1, 53, -1, 
+  -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, 
+  65, 66, 67, 68, -1, 70, -1, 72, -1, 74, 
+  -1, 76, -1, -1, -1, -1, 81, 82, 83, -1, 
+  -1, -1, 87, -1, -1, -1, -1, 92, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 8, -1, -1, 11, 
+  12, 13, -1, -1, -1, -1, -1, -1, -1, -1, 
+  22, -1, -1, -1, -1, -1, -1, 29, -1, -1, 
+  -1, 33, 34, -1, 36, -1, -1, -1, 40, -1, 
+  42, 43, 44, -1, -1, 47, -1, -1, -1, 51, 
+  -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 65, 66, 67, 68, -1, 70, -1, 
+  72, -1, 74, -1, 76, -1, -1, -1, -1, 81, 
+  82, 83, -1, -1, -1, 87, -1, -1, -1, -1, 
+  92, -1, -1, -1, -1, -1, -1, -1, -1, 8, 
+  -1, -1, 11, 12, 13, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, 
+  29, -1, -1, -1, 33, 34, -1, 36, -1, -1, 
+  -1, 40, -1, 42, 43, 44, -1, -1, 47, -1, 
+  -1, -1, 51, -1, 53, -1, -1, 56, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 65, 66, 67, 68, 
+  -1, 70, -1, 72, -1, 74, -1, 76, -1, -1, 
+  -1, -1, 81, 82, 83, -1, -1, -1, 87, -1, 
+  -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 8, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, -1, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  56, -1, -1, -1, -1, -1, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 11, 12, 13, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, 
+  -1, -1, -1, 29, 30, -1, -1, 33, 34, -1, 
+  36, -1, -1, -1, 40, -1, 42, 43, 44, -1, 
+  -1, 47, -1, -1, -1, 51, -1, 53, -1, -1, 
+  -1, -1, -1, -1, -1, 61, -1, -1, -1, 65, 
+  66, 67, 68, -1, 70, -1, 72, -1, 74, -1, 
+  76, -1, -1, -1, -1, 81, 82, 83, -1, -1, 
+  -1, 87, -1, -1, -1, -1, 92, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 4, 5, 6, -1, -1, 
+  9, 10, 11, -1, -1, 14, -1, 16, -1, -1, 
+  -1, 20, 21, 22, -1, -1, -1, -1, -1, -1, 
+  29, 30, 31, 32, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 43, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  59, -1, -1, -1, -1, -1, -1, 66, 67, 68, 
+  69, 70, 71, -1, 73, 74, 75, 76, 77, 78, 
+  -1, -1, 81, 82, 83, 84, 85, 86, -1, -1, 
+  -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, 
+  -1, -1, 4, 5, 6, -1, -1, 9, 10, 11, 
+  -1, -1, 14, -1, 16, -1, -1, -1, 20, 21, 
+  22, -1, -1, -1, -1, -1, -1, 29, 30, 31, 
+  32, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, 43, -1, -1, -1, 47, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, 
+  -1, -1, -1, 65, 66, 67, -1, 69, 70, 71, 
+  -1, 73, 74, 75, 76, 77, 78, -1, -1, 81, 
+  82, 83, 84, 85, 86, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 
+  5, 6, -1, -1, 9, 10, 11, -1, -1, 14, 
+  -1, 16, -1, -1, -1, 20, 21, 22, -1, -1, 
+  -1, -1, -1, -1, 29, 30, 31, 32, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 
+  -1, -1, 47, -1, -1, -1, -1, -1, -1, -1, 
+  55, -1, -1, -1, 59, -1, -1, -1, -1, -1, 
+  65, 66, 67, -1, 69, 70, 71, -1, 73, 74, 
+  75, 76, 77, 78, -1, -1, 81, 82, 83, 84, 
+  85, 86, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, 
+  -1, 9, -1, 11, 12, 13, 14, -1, -1, -1, 
+  -1, -1, -1, 21, 22, -1, -1, -1, -1, -1, 
+  -1, 29, 30, -1, -1, 33, 34, -1, 36, -1, 
+  -1, -1, 40, -1, 42, 43, 44, -1, -1, 47, 
+  -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, 
+  -1, 59, -1, 61, -1, -1, -1, 65, 66, 67, 
+  68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 
+  78, -1, -1, 81, 82, 83, 84, 85, -1, 87, 
+  -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, 
+  -1, -1, -1, 4, -1, -1, -1, -1, 9, -1, 
+  11, 12, 13, 14, -1, -1, -1, -1, -1, -1, 
+  21, 22, -1, -1, -1, -1, -1, -1, 29, 30, 
+  -1, -1, 33, 34, -1, 36, -1, -1, -1, 40, 
+  -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, 
+  51, -1, 53, -1, -1, -1, -1, -1, 59, -1, 
+  61, -1, -1, -1, 65, 66, 67, 68, 69, 70, 
+  71, 72, 73, 74, 75, 76, 77, 78, -1, -1, 
+  81, 82, 83, 84, 85, -1, 87, -1, -1, -1, 
+  -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 
+  4, 5, 6, -1, -1, 9, 10, 11, 12, 13, 
+  14, -1, 16, -1, -1, -1, 20, 21, 22, -1, 
+  -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, 
+  34, -1, 36, -1, -1, -1, 40, -1, 42, 43, 
+  44, -1, -1, 47, -1, -1, -1, 51, -1, 53, 
+  -1, -1, -1, -1, -1, 59, -1, 61, -1, -1, 
+  -1, 65, 66, 67, 68, 69, 70, 71, 72, 73, 
+  74, 75, 76, 77, 78, -1, -1, 81, 82, 83, 
+  84, 85, 86, 87, -1, -1, -1, -1, 92, -1, 
+  -1, -1, -1, -1, -1, -1, -1, 4, 5, 6, 
+  -1, -1, 9, 10, 11, 12, 13, 14, -1, 16, 
+  -1, -1, -1, 20, 21, 22, -1, -1, -1, -1, 
+  -1, -1, 29, 30, 31, 32, 33, 34, -1, 36, 
+  -1, -1, -1, 40, -1, 42, 43, 44, -1, -1, 
+  47, -1, -1, -1, 51, -1, 53, -1, 55, -1, 
+  -1, -1, 59, -1, 61, -1, -1, -1, 65, 66, 
+  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 
+  77, 78, -1, -1, 81, 82, 83, 84, 85, 86, 
+  87, -1, -1, -1, -1, 92, -1, -1, -1, -1, 
+  -1, -1, -1, -1, 
+
+  35, 15, 15, 15, 2, 15, 3, 2, 25, 3, 
+  15, 15, 104, 15, 4, 3, 3, 3, 19, 15, 
+  2, 21, 15, 15, 3, 67, 25, 3, 19, 2, 
+  15, 2, 15, 13, 15, 19, 25, 3, 15, 11, 
+  15, 2, 96, 3, 2, 15, 2, 25, 3, 2, 
+  15, 100, 15, 93, 3, 2, 15, 98, 15, 2, 
+  2, 35, 3, 3, 15, 2, 35, 35, 35, 21, 
+  2, 25, 3, 35, 4, 21, 15, 2, 2, 15, 
+  2, 4, 3, 3, 3, 35, 2, 35, 21, 3, 
+  35, 3, 36, 21, 3, 13, 2, 35, 13, -1, 
+  35, 35, 2, -1, 15, 13, 35, -1, 16, -1, 
+  -1, 40, -1, -1, -1, -1, 13, 44, 44, 46, 
+  46, 13, 15, -1, 16, -1, 41, 44, -1, 46, 
+  35, 44, -1, 46, 44, 40, 46, 44, 3, 46, 
+  44, 44, 44, 44, 41, 44, 49, 49, 49, 44, 
+  49, 46, 2, 44, 58, 46, 44, 44, 44, 15, 
+  46, 49, 49, 44, 44, 44, 46, 44, 44, 44, 
+  49, 15, 49, 49, 44, 81, 44, 52, 44, 60, 
+  50, 81, 50, 44, 50, 44, 44, 44, 99, 3, 
+  49, 49, 13, 37, 87, 56, 44, 54, 44, 20, 
+  3, 49, 48, 68, 44, 44, 44, 44, 48, 48, 
+  47, 44, 50, 46, 44, 44, 46, 46, 44, 44, 
+  46, 44, 47, 46, 44, 44, 46, 46, 44, 85, 
+  46, 3, 13, 31, 44, 15, 44, 35, -1, 49, 
+  44, 49, 44, 51, 44, 49, -1, 49, 44, 49, 
+  -1, 61, -1, 49, 68, -1, 13, 37, 38, 16, 
+  41, 57, 66, -1, 66, 68, 66, 44, 44, 44, 
+  -1, -1, 49, 49, 49, 51, 51, 44, 55, 44, 
+  44, 44, 49, 44, 49, 49, 49, 51, 49, -1, 
+  53, 13, 59, -1, 13, 5, 68, 16, 20, 18, 
+  5, 66, -1, 13, -1, 66, 28, 29, 13, -1, 
+  20, -1, -1, -1, -1, 20, 35, -1, 28, 29, 
+  13, -1, -1, 28, 29, -1, -1, 20, 21, 22, 
+  23, 24, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, 13, 
+  -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1};
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsgrammar_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsgrammar_p.h
new file mode 100644
index 0000000..ed3ca19
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsgrammar_p.h
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// This file was generated by qlalr - DO NOT EDIT!
+#ifndef QDECLARATIVEJSGRAMMAR_P_H
+#define QDECLARATIVEJSGRAMMAR_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeJSGrammar
+{
+public:
+  enum VariousConstants {
+    EOF_SYMBOL = 0,
+    REDUCE_HERE = 100,
+    SHIFT_THERE = 99,
+    T_AND = 1,
+    T_AND_AND = 2,
+    T_AND_EQ = 3,
+    T_AS = 91,
+    T_AUTOMATIC_SEMICOLON = 62,
+    T_BREAK = 4,
+    T_CASE = 5,
+    T_CATCH = 6,
+    T_COLON = 7,
+    T_COMMA = 8,
+    T_COMMENT = 88,
+    T_CONST = 84,
+    T_CONTINUE = 9,
+    T_DEBUGGER = 85,
+    T_DEFAULT = 10,
+    T_DELETE = 11,
+    T_DIVIDE_ = 12,
+    T_DIVIDE_EQ = 13,
+    T_DO = 14,
+    T_DOT = 15,
+    T_ELSE = 16,
+    T_EQ = 17,
+    T_EQ_EQ = 18,
+    T_EQ_EQ_EQ = 19,
+    T_FALSE = 83,
+    T_FEED_JS_EXPRESSION = 96,
+    T_FEED_JS_PROGRAM = 98,
+    T_FEED_JS_SOURCE_ELEMENT = 97,
+    T_FEED_JS_STATEMENT = 95,
+    T_FEED_UI_OBJECT_MEMBER = 94,
+    T_FEED_UI_PROGRAM = 93,
+    T_FINALLY = 20,
+    T_FOR = 21,
+    T_FUNCTION = 22,
+    T_GE = 23,
+    T_GT = 24,
+    T_GT_GT = 25,
+    T_GT_GT_EQ = 26,
+    T_GT_GT_GT = 27,
+    T_GT_GT_GT_EQ = 28,
+    T_IDENTIFIER = 29,
+    T_IF = 30,
+    T_IMPORT = 90,
+    T_IN = 31,
+    T_INSTANCEOF = 32,
+    T_LBRACE = 33,
+    T_LBRACKET = 34,
+    T_LE = 35,
+    T_LPAREN = 36,
+    T_LT = 37,
+    T_LT_LT = 38,
+    T_LT_LT_EQ = 39,
+    T_MINUS = 40,
+    T_MINUS_EQ = 41,
+    T_MINUS_MINUS = 42,
+    T_MULTILINE_STRING_LITERAL = 87,
+    T_NEW = 43,
+    T_NOT = 44,
+    T_NOT_EQ = 45,
+    T_NOT_EQ_EQ = 46,
+    T_NULL = 81,
+    T_NUMERIC_LITERAL = 47,
+    T_ON = 92,
+    T_OR = 48,
+    T_OR_EQ = 49,
+    T_OR_OR = 50,
+    T_PLUS = 51,
+    T_PLUS_EQ = 52,
+    T_PLUS_PLUS = 53,
+    T_PROPERTY = 66,
+    T_PUBLIC = 89,
+    T_QUESTION = 54,
+    T_RBRACE = 55,
+    T_RBRACKET = 56,
+    T_READONLY = 68,
+    T_REMAINDER = 57,
+    T_REMAINDER_EQ = 58,
+    T_RESERVED_WORD = 86,
+    T_RETURN = 59,
+    T_RPAREN = 60,
+    T_SEMICOLON = 61,
+    T_SIGNAL = 67,
+    T_STAR = 63,
+    T_STAR_EQ = 64,
+    T_STRING_LITERAL = 65,
+    T_SWITCH = 69,
+    T_THIS = 70,
+    T_THROW = 71,
+    T_TILDE = 72,
+    T_TRUE = 82,
+    T_TRY = 73,
+    T_TYPEOF = 74,
+    T_VAR = 75,
+    T_VOID = 76,
+    T_WHILE = 77,
+    T_WITH = 78,
+    T_XOR = 79,
+    T_XOR_EQ = 80,
+
+    ACCEPT_STATE = 645,
+    RULE_COUNT = 347,
+    STATE_COUNT = 646,
+    TERMINAL_COUNT = 101,
+    NON_TERMINAL_COUNT = 106,
+
+    GOTO_INDEX_OFFSET = 646,
+    GOTO_INFO_OFFSET = 2714,
+    GOTO_CHECK_OFFSET = 2714
+  };
+
+  static const char  *const    spell [];
+  static const short             lhs [];
+  static const short             rhs [];
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
+
+  static inline int nt_action (int state, int nt)
+  {
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
+      return goto_default [nt];
+
+    return action_info [GOTO_INFO_OFFSET + yyn];
+  }
+
+  static inline int t_action (int state, int token)
+  {
+    const int yyn = action_index [state] + token;
+
+    if (yyn < 0 || action_check [yyn] != token)
+      return - action_default [state];
+
+    return action_info [yyn];
+  }
+};
+
+
+QT_END_NAMESPACE
+#endif // QDECLARATIVEJSGRAMMAR_P_H
+
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejslexer.cpp b/tools/qdoc3/declarativeparser/qdeclarativejslexer.cpp
new file mode 100644
index 0000000..f5fb791
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejslexer.cpp
@@ -0,0 +1,1258 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "qdeclarativejslexer_p.h"
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativejsgrammar_p.h"
+
+#include <QtCore/qcoreapplication.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+QT_BEGIN_NAMESPACE
+Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
+QT_END_NAMESPACE
+
+QT_QML_BEGIN_NAMESPACE
+
+#define shiftWindowsLineBreak() \
+    do { \
+        if (((current == '\r') && (next1 == '\n')) \
+            || ((current == '\n') && (next1 == '\r'))) { \
+            shift(1); \
+        } \
+    } \
+    while (0)
+
+namespace QDeclarativeJS {
+extern double integerFromString(const char *buf, int size, int radix);
+}
+
+using namespace QDeclarativeJS;
+
+Lexer::Lexer(Engine *eng, bool tokenizeComments)
+    : driver(eng),
+      yylineno(0),
+      done(false),
+      size8(128), size16(128),
+      pos8(0), pos16(0),
+      terminator(false),
+      restrKeyword(false),
+      delimited(false),
+      stackToken(-1),
+      state(Start),
+      pos(0),
+      code(0), length(0),
+      yycolumn(0),
+      startpos(0),
+      startlineno(0), startcolumn(0),
+      bol(true),
+      current(0), next1(0), next2(0), next3(0),
+      err(NoError),
+      wantRx(false),
+      check_reserved(true),
+      parenthesesState(IgnoreParentheses),
+      parenthesesCount(0),
+      prohibitAutomaticSemicolon(false),
+      tokenizeComments(tokenizeComments)
+{
+    if (driver) driver->setLexer(this);
+    // allocate space for read buffers
+    buffer8 = new char[size8];
+    buffer16 = new QChar[size16];
+    pattern = 0;
+    flags = 0;
+
+}
+
+Lexer::~Lexer()
+{
+    delete [] buffer8;
+    delete [] buffer16;
+}
+
+void Lexer::setCode(const QString &c, int lineno)
+{
+    errmsg.clear();
+    yylineno = lineno;
+    yycolumn = 1;
+    restrKeyword = false;
+    delimited = false;
+    stackToken = -1;
+    pos = 0;
+    code = c.unicode();
+    length = c.length();
+    bol = true;
+
+    // read first characters
+    current = (length > 0) ? code[0].unicode() : 0;
+    next1 = (length > 1) ? code[1].unicode() : 0;
+    next2 = (length > 2) ? code[2].unicode() : 0;
+    next3 = (length > 3) ? code[3].unicode() : 0;
+}
+
+void Lexer::shift(uint p)
+{
+    while (p--) {
+        ++pos;
+        ++yycolumn;
+        current = next1;
+        next1 = next2;
+        next2 = next3;
+        next3 = (pos + 3 < length) ? code[pos+3].unicode() : 0;
+    }
+}
+
+void Lexer::setDone(State s)
+{
+    state = s;
+    done = true;
+}
+
+int Lexer::findReservedWord(const QChar *c, int size) const
+{
+    switch (size) {
+    case 2: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o'))
+            return QDeclarativeJSGrammar::T_DO;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_IF;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_IN;
+        else if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('s'))
+            return QDeclarativeJSGrammar::T_AS;
+        else if (c[0] == QLatin1Char('o') && c[1] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_ON;
+    }   break;
+
+    case 3: {
+        if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('o') && c[2] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_FOR;
+        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('e') && c[2] == QLatin1Char('w'))
+            return QDeclarativeJSGrammar::T_NEW;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r') && c[2] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_TRY;
+        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('a') && c[2] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_VAR;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n') && c[2] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 4: {
+        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_CASE;
+        else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('l')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_ELSE;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('s'))
+            return QDeclarativeJSGrammar::T_THIS;
+        else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('d'))
+            return QDeclarativeJSGrammar::T_VOID;
+        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('i')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_WITH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_TRUE;
+        else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('u')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('l'))
+            return QDeclarativeJSGrammar::T_NULL;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('n')
+                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('m'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('y')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('l') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('g'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('r'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('g') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('o'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 5: {
+        if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('e') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('k'))
+            return QDeclarativeJSGrammar::T_BREAK;
+        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('c')
+                && c[4] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_CATCH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
+                && c[4] == QLatin1Char('w'))
+            return QDeclarativeJSGrammar::T_THROW;
+        else if (c[0] == QLatin1Char('w') && c[1] == QLatin1Char('h')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('l')
+                && c[4] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_WHILE;
+        else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('s')
+                && c[4] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_CONST;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('a')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('s')
+                && c[4] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_FALSE;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('r')
+                    && c[4] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('u')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('r'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('l'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('l')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('s')
+                    && c[4] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('l')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 6: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('e')
+                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_DELETE;
+        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('u')
+                && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_RETURN;
+        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('w')
+                && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('c') && c[5] == QLatin1Char('h'))
+            return QDeclarativeJSGrammar::T_SWITCH;
+        else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('y')
+                && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('e')
+                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_TYPEOF;
+        else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+            && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+            && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_IMPORT;
+        else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('i')
+            && c[2] == QLatin1Char('g') && c[3] == QLatin1Char('n')
+            && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('l'))
+            return QDeclarativeJSGrammar::T_SIGNAL;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('t')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('u') && c[3] == QLatin1Char('b')
+                    && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('u')
+                    && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('c'))
+                return QDeclarativeJSGrammar::T_PUBLIC;
+            else if (c[0] == QLatin1Char('n') && c[1] == QLatin1Char('a')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('i')
+                    && c[4] == QLatin1Char('v') && c[5] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('h')
+                    && c[2] == QLatin1Char('r') && c[3] == QLatin1Char('o')
+                    && c[4] == QLatin1Char('w') && c[5] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 7: {
+        if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('f') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('u') && c[5] == QLatin1Char('l')
+                && c[6] == QLatin1Char('t'))
+            return QDeclarativeJSGrammar::T_DEFAULT;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('i')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('a')
+                && c[4] == QLatin1Char('l') && c[5] == QLatin1Char('l')
+                && c[6] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_FINALLY;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('b') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('a')
+                    && c[6] == QLatin1Char('n'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('e') && c[1] == QLatin1Char('x')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('n') && c[5] == QLatin1Char('d')
+                    && c[6] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('a')
+                    && c[2] == QLatin1Char('c') && c[3] == QLatin1Char('k')
+                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('g')
+                    && c[6] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('i') && c[3] == QLatin1Char('v')
+                    && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('t')
+                    && c[6] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 8: {
+        if (c[0] == QLatin1Char('c') && c[1] == QLatin1Char('o')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('i') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('u') && c[7] == QLatin1Char('e'))
+            return QDeclarativeJSGrammar::T_CONTINUE;
+        else if (c[0] == QLatin1Char('f') && c[1] == QLatin1Char('u')
+                && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
+                && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
+                && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n'))
+            return QDeclarativeJSGrammar::T_FUNCTION;
+        else if (c[0] == QLatin1Char('d') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('b') && c[3] == QLatin1Char('u')
+                && c[4] == QLatin1Char('g') && c[5] == QLatin1Char('g')
+                && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('r'))
+            return QDeclarativeJSGrammar::T_DEBUGGER;
+        else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('p')
+                && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('r')
+                && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_PROPERTY;
+        else if (c[0] == QLatin1Char('r') && c[1] == QLatin1Char('e')
+                && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('d')
+                && c[4] == QLatin1Char('o') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('y'))
+            return QDeclarativeJSGrammar::T_READONLY;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('a') && c[1] == QLatin1Char('b')
+                    && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('a')
+                    && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('v') && c[1] == QLatin1Char('o')
+                    && c[2] == QLatin1Char('l') && c[3] == QLatin1Char('a')
+                    && c[4] == QLatin1Char('t') && c[5] == QLatin1Char('i')
+                    && c[6] == QLatin1Char('l') && c[7] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 9: {
+        if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
+                    && c[2] == QLatin1Char('t') && c[3] == QLatin1Char('e')
+                    && c[4] == QLatin1Char('r') && c[5] == QLatin1Char('f')
+                    && c[6] == QLatin1Char('a') && c[7] == QLatin1Char('c')
+                    && c[8] == QLatin1Char('e'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('t') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('a') && c[3] == QLatin1Char('n')
+                    && c[4] == QLatin1Char('s') && c[5] == QLatin1Char('i')
+                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('t'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+            else if (c[0] == QLatin1Char('p') && c[1] == QLatin1Char('r')
+                    && c[2] == QLatin1Char('o') && c[3] == QLatin1Char('t')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('c')
+                    && c[6] == QLatin1Char('t') && c[7] == QLatin1Char('e')
+                    && c[8] == QLatin1Char('d'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 10: {
+        if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('n')
+                && c[2] == QLatin1Char('s') && c[3] == QLatin1Char('t')
+                && c[4] == QLatin1Char('a') && c[5] == QLatin1Char('n')
+                && c[6] == QLatin1Char('c') && c[7] == QLatin1Char('e')
+                && c[8] == QLatin1Char('o') && c[9] == QLatin1Char('f'))
+            return QDeclarativeJSGrammar::T_INSTANCEOF;
+        else if (check_reserved) {
+            if (c[0] == QLatin1Char('i') && c[1] == QLatin1Char('m')
+                    && c[2] == QLatin1Char('p') && c[3] == QLatin1Char('l')
+                    && c[4] == QLatin1Char('e') && c[5] == QLatin1Char('m')
+                    && c[6] == QLatin1Char('e') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('t') && c[9] == QLatin1Char('s'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    case 12: {
+        if (check_reserved) {
+            if (c[0] == QLatin1Char('s') && c[1] == QLatin1Char('y')
+                    && c[2] == QLatin1Char('n') && c[3] == QLatin1Char('c')
+                    && c[4] == QLatin1Char('h') && c[5] == QLatin1Char('r')
+                    && c[6] == QLatin1Char('o') && c[7] == QLatin1Char('n')
+                    && c[8] == QLatin1Char('i') && c[9] == QLatin1Char('z')
+                    && c[10] == QLatin1Char('e') && c[11] == QLatin1Char('d'))
+                return QDeclarativeJSGrammar::T_RESERVED_WORD;
+        }
+    }   break;
+
+    } // switch
+
+    return -1;
+}
+
+int Lexer::lex()
+{
+    int token = 0;
+    state = Start;
+    ushort stringType = 0; // either single or double quotes
+    bool multiLineString = false;
+    pos8 = pos16 = 0;
+    done = false;
+    terminator = false;
+
+    // did we push a token on the stack previously ?
+    // (after an automatic semicolon insertion)
+    if (stackToken >= 0) {
+        setDone(Other);
+        token = stackToken;
+        stackToken = -1;
+    }
+
+    bool identifierWithEscapedUnicode = false;
+
+    while (!done) {
+        switch (state) {
+        case Start:
+            if (isWhiteSpace()) {
+                // do nothing
+            } else if (current == '/' && next1 == '/') {
+                recordStartPos();
+                shift(1);
+                state = InSingleLineComment;
+            } else if (current == '/' && next1 == '*') {
+                recordStartPos();
+                shift(1);
+                state = InMultiLineComment;
+            } else if (current == 0) {
+                syncProhibitAutomaticSemicolon();
+                if (!terminator && !delimited && !prohibitAutomaticSemicolon) {
+                    // automatic semicolon insertion if program incomplete
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    stackToken = 0;
+                    setDone(Other);
+                } else {
+                    setDone(Eof);
+                }
+            } else if (isLineTerminator()) {
+                if (restrKeyword) {
+                    // automatic semicolon insertion
+                    recordStartPos();
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    setDone(Other);
+                } else {
+                    shiftWindowsLineBreak();
+                    yylineno++;
+                    yycolumn = 0;
+                    bol = true;
+                    terminator = true;
+                    syncProhibitAutomaticSemicolon();
+                }
+            } else if (current == '"' || current == '\'') {
+                recordStartPos();
+                state = InString;
+                multiLineString = false;
+                stringType = current;
+            } else if (current == '\\' && next1 == 'u') {
+                identifierWithEscapedUnicode = true;
+                recordStartPos();
+
+                shift(2); // skip the unicode escape prefix `\u'
+
+                if (isHexDigit(current) && isHexDigit(next1) &&
+                     isHexDigit(next2) && isHexDigit(next3)) {
+                    record16(convertUnicode(current, next1, next2, next3));
+                    shift(3);
+                    state = InIdentifier;
+                } else {
+                    setDone(Bad);
+                    err = IllegalUnicodeEscapeSequence;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal unicode escape sequence");
+                    break;
+                }
+
+            } else if (isIdentLetter(current)) {
+                identifierWithEscapedUnicode = false;
+                recordStartPos();
+                record16(current);
+                state = InIdentifier;
+            } else if (current == '0') {
+                recordStartPos();
+                record8(current);
+                state = InNum0;
+            } else if (isDecimalDigit(current)) {
+                recordStartPos();
+                record8(current);
+                state = InNum;
+            } else if (current == '.' && isDecimalDigit(next1)) {
+                recordStartPos();
+                record8(current);
+                state = InDecimal;
+            } else {
+                recordStartPos();
+                token = matchPunctuator(current, next1, next2, next3);
+                if (token != -1) {
+                    if (terminator && !delimited && !prohibitAutomaticSemicolon
+                        && (token == QDeclarativeJSGrammar::T_PLUS_PLUS
+                            || token == QDeclarativeJSGrammar::T_MINUS_MINUS)) {
+                        // automatic semicolon insertion
+                        stackToken = token;
+                        token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    }
+                    setDone(Other);
+                }
+                else {
+                    setDone(Bad);
+                    err = IllegalCharacter;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal character");
+                }
+            }
+            break;
+        case InString:
+            if (current == stringType) {
+                shift(1);
+                setDone(String);
+            } else if (isLineTerminator()) {
+                multiLineString = true;
+                record16(current);
+            } else if (current == 0 || isLineTerminator()) {
+                setDone(Bad);
+                err = UnclosedStringLiteral;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unclosed string at end of line");
+            } else if (current == '\\') {
+                state = InEscapeSequence;
+            } else {
+                record16(current);
+            }
+            break;
+            // Escape Sequences inside of strings
+        case InEscapeSequence:
+            if (isOctalDigit(current)) {
+                if (current >= '0' && current <= '3' &&
+                     isOctalDigit(next1) && isOctalDigit(next2)) {
+                    record16(convertOctal(current, next1, next2));
+                    shift(2);
+                    state = InString;
+                } else if (isOctalDigit(current) &&
+                            isOctalDigit(next1)) {
+                    record16(convertOctal('0', current, next1));
+                    shift(1);
+                    state = InString;
+                } else if (isOctalDigit(current)) {
+                    record16(convertOctal('0', '0', current));
+                    state = InString;
+                } else {
+                    setDone(Bad);
+                    err = IllegalEscapeSequence;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal escape sequence");
+                }
+            } else if (current == 'x')
+                state = InHexEscape;
+            else if (current == 'u')
+                state = InUnicodeEscape;
+            else {
+                if (isLineTerminator()) {
+                    shiftWindowsLineBreak();
+                    yylineno++;
+                    yycolumn = 0;
+                    bol = true;
+                } else {
+                    record16(singleEscape(current));
+                }
+                state = InString;
+            }
+            break;
+        case InHexEscape:
+            if (isHexDigit(current) && isHexDigit(next1)) {
+                state = InString;
+                record16(QLatin1Char(convertHex(current, next1)));
+                shift(1);
+            } else if (current == stringType) {
+                record16(QLatin1Char('x'));
+                shift(1);
+                setDone(String);
+            } else {
+                record16(QLatin1Char('x'));
+                record16(current);
+                state = InString;
+            }
+            break;
+        case InUnicodeEscape:
+            if (isHexDigit(current) && isHexDigit(next1) &&
+                 isHexDigit(next2) && isHexDigit(next3)) {
+                record16(convertUnicode(current, next1, next2, next3));
+                shift(3);
+                state = InString;
+            } else if (current == stringType) {
+                record16(QLatin1Char('u'));
+                shift(1);
+                setDone(String);
+            } else {
+                setDone(Bad);
+                err = IllegalUnicodeEscapeSequence;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal unicode escape sequence");
+            }
+            break;
+        case InSingleLineComment:
+            if (isLineTerminator()) {
+                shiftWindowsLineBreak();
+                yylineno++;
+                yycolumn = 0;
+                terminator = true;
+                bol = true;
+                if (restrKeyword) {
+                    token = QDeclarativeJSGrammar::T_SEMICOLON;
+                    setDone(Other);
+                } else
+                    state = Start;
+                if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2);
+            } else if (current == 0) {
+                if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2);
+                setDone(Eof);
+            }
+
+            break;
+        case InMultiLineComment:
+            if (current == 0) {
+                setDone(Bad);
+                err = UnclosedComment;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unclosed comment at end of file");
+                if (driver) driver->addComment(startpos+2, tokenLength()-2, startlineno, startcolumn+2);
+            } else if (isLineTerminator()) {
+                shiftWindowsLineBreak();
+                yylineno++;
+            } else if (current == '*' && next1 == '/') {
+                state = Start;
+                shift(1);
+                if (driver) driver->addComment(startpos+2, tokenLength()-3, startlineno, startcolumn+2);
+            }
+
+            break;
+        case InIdentifier:
+            if (isIdentLetter(current) || isDecimalDigit(current)) {
+                record16(current);
+                break;
+            } else if (current == '\\' && next1 == 'u') {
+                identifierWithEscapedUnicode = true;
+                shift(2); // skip the unicode escape prefix `\u'
+
+                if (isHexDigit(current) && isHexDigit(next1) &&
+                     isHexDigit(next2) && isHexDigit(next3)) {
+                    record16(convertUnicode(current, next1, next2, next3));
+                    shift(3);
+                    break;
+                } else {
+                    setDone(Bad);
+                    err = IllegalUnicodeEscapeSequence;
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal unicode escape sequence");
+                    break;
+                }
+            }
+            setDone(Identifier);
+            break;
+        case InNum0:
+            if (current == 'x' || current == 'X') {
+                record8(current);
+                state = InHex;
+            } else if (current == '.') {
+                record8(current);
+                state = InDecimal;
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else if (isOctalDigit(current)) {
+                record8(current);
+                state = InOctal;
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InDecimal;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InHex:
+            if (isHexDigit(current))
+                record8(current);
+            else
+                setDone(Hex);
+            break;
+        case InOctal:
+            if (isOctalDigit(current)) {
+                record8(current);
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InDecimal;
+            } else {
+                setDone(Octal);
+            }
+            break;
+        case InNum:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else if (current == '.') {
+                record8(current);
+                state = InDecimal;
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InDecimal:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else if (current == 'e' || current == 'E') {
+                record8(current);
+                state = InExponentIndicator;
+            } else {
+                setDone(Number);
+            }
+            break;
+        case InExponentIndicator:
+            if (current == '+' || current == '-') {
+                record8(current);
+            } else if (isDecimalDigit(current)) {
+                record8(current);
+                state = InExponent;
+            } else {
+                setDone(Bad);
+                err = IllegalExponentIndicator;
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Illegal syntax for exponential number");
+            }
+            break;
+        case InExponent:
+            if (isDecimalDigit(current)) {
+                record8(current);
+            } else {
+                setDone(Number);
+            }
+            break;
+        default:
+            Q_ASSERT_X(0, "Lexer::lex", "Unhandled state in switch statement");
+        }
+
+        // move on to the next character
+        if (!done)
+            shift(1);
+        if (state != Start && state != InSingleLineComment)
+            bol = false;
+    }
+
+    // no identifiers allowed directly after numeric literal, e.g. "3in" is bad
+    if ((state == Number || state == Octal || state == Hex)
+         && isIdentLetter(current)) {
+        state = Bad;
+        err = IllegalIdentifier;
+        errmsg = QCoreApplication::translate("QDeclarativeParser", "Identifier cannot start with numeric literal");
+    }
+
+    // terminate string
+    buffer8[pos8] = '\0';
+
+    double dval = 0;
+    if (state == Number) {
+        dval = qstrtod(buffer8, 0, 0);
+    } else if (state == Hex) { // scan hex numbers
+        dval = integerFromString(buffer8, pos8, 16);
+        state = Number;
+    } else if (state == Octal) {   // scan octal number
+        dval = integerFromString(buffer8, pos8, 8);
+        state = Number;
+    }
+
+    restrKeyword = false;
+    delimited = false;
+
+    switch (parenthesesState) {
+    case IgnoreParentheses:
+        break;
+    case CountParentheses:
+        if (token == QDeclarativeJSGrammar::T_RPAREN) {
+            --parenthesesCount;
+            if (parenthesesCount == 0)
+                parenthesesState = BalancedParentheses;
+        } else if (token == QDeclarativeJSGrammar::T_LPAREN) {
+            ++parenthesesCount;
+        }
+        break;
+    case BalancedParentheses:
+        parenthesesState = IgnoreParentheses;
+        break;
+    }
+
+    switch (state) {
+    case Eof:
+        return 0;
+    case Other:
+        if (token == QDeclarativeJSGrammar::T_RBRACE || token == QDeclarativeJSGrammar::T_SEMICOLON)
+            delimited = true;
+        return token;
+    case Identifier:
+        token = -1;
+        if (! identifierWithEscapedUnicode)
+            token = findReservedWord(buffer16, pos16);
+
+        if (token < 0) {
+            /* TODO: close leak on parse error. same holds true for String */
+            if (driver)
+                qsyylval.ustr = driver->intern(buffer16, pos16);
+            else
+                qsyylval.ustr = 0;
+            return QDeclarativeJSGrammar::T_IDENTIFIER;
+        }
+        if (token == QDeclarativeJSGrammar::T_CONTINUE || token == QDeclarativeJSGrammar::T_BREAK
+            || token == QDeclarativeJSGrammar::T_RETURN || token == QDeclarativeJSGrammar::T_THROW) {
+            restrKeyword = true;
+        } else if (token == QDeclarativeJSGrammar::T_IF || token == QDeclarativeJSGrammar::T_FOR
+                   || token == QDeclarativeJSGrammar::T_WHILE || token == QDeclarativeJSGrammar::T_WITH) {
+            parenthesesState = CountParentheses;
+            parenthesesCount = 0;
+        } else if (token == QDeclarativeJSGrammar::T_DO) {
+            parenthesesState = BalancedParentheses;
+        }
+        return token;
+    case String:
+        if (driver)
+            qsyylval.ustr = driver->intern(buffer16, pos16);
+        else
+            qsyylval.ustr = 0;
+        return multiLineString?QDeclarativeJSGrammar::T_MULTILINE_STRING_LITERAL:QDeclarativeJSGrammar::T_STRING_LITERAL;
+    case Number:
+        qsyylval.dval = dval;
+        return QDeclarativeJSGrammar::T_NUMERIC_LITERAL;
+    case Bad:
+        return -1;
+    default:
+        Q_ASSERT(!"unhandled numeration value in switch");
+        return -1;
+    }
+}
+
+bool Lexer::isWhiteSpace() const
+{
+    return (current == ' ' || current == '\t' ||
+             current == 0x0b || current == 0x0c);
+}
+
+bool Lexer::isLineTerminator() const
+{
+    return (current == '\n' || current == '\r');
+}
+
+bool Lexer::isIdentLetter(ushort c)
+{
+    // ASCII-biased, since all reserved words are ASCII, aand hence the
+    // bulk of content to be parsed.
+    if ((c >= 'a' && c <= 'z')
+            || (c >= 'A' && c <= 'Z')
+            || c == '$'
+            || c == '_')
+        return true;
+    if (c < 128)
+        return false;
+    return QChar(c).isLetterOrNumber();
+}
+
+bool Lexer::isDecimalDigit(ushort c)
+{
+    return (c >= '0' && c <= '9');
+}
+
+bool Lexer::isHexDigit(ushort c) const
+{
+    return ((c >= '0' && c <= '9')
+            || (c >= 'a' && c <= 'f')
+            || (c >= 'A' && c <= 'F'));
+}
+
+bool Lexer::isOctalDigit(ushort c) const
+{
+    return (c >= '0' && c <= '7');
+}
+
+int Lexer::matchPunctuator(ushort c1, ushort c2,
+                            ushort c3, ushort c4)
+{
+    if (c1 == '>' && c2 == '>' && c3 == '>' && c4 == '=') {
+        shift(4);
+        return QDeclarativeJSGrammar::T_GT_GT_GT_EQ;
+    } else if (c1 == '=' && c2 == '=' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_EQ_EQ_EQ;
+    } else if (c1 == '!' && c2 == '=' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_NOT_EQ_EQ;
+    } else if (c1 == '>' && c2 == '>' && c3 == '>') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_GT_GT_GT;
+    } else if (c1 == '<' && c2 == '<' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_LT_LT_EQ;
+    } else if (c1 == '>' && c2 == '>' && c3 == '=') {
+        shift(3);
+        return QDeclarativeJSGrammar::T_GT_GT_EQ;
+    } else if (c1 == '<' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_LE;
+    } else if (c1 == '>' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_GE;
+    } else if (c1 == '!' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_NOT_EQ;
+    } else if (c1 == '+' && c2 == '+') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_PLUS_PLUS;
+    } else if (c1 == '-' && c2 == '-') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_MINUS_MINUS;
+    } else if (c1 == '=' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_EQ_EQ;
+    } else if (c1 == '+' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_PLUS_EQ;
+    } else if (c1 == '-' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_MINUS_EQ;
+    } else if (c1 == '*' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_STAR_EQ;
+    } else if (c1 == '/' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_DIVIDE_EQ;
+    } else if (c1 == '&' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_AND_EQ;
+    } else if (c1 == '^' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_XOR_EQ;
+    } else if (c1 == '%' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_REMAINDER_EQ;
+    } else if (c1 == '|' && c2 == '=') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_OR_EQ;
+    } else if (c1 == '<' && c2 == '<') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_LT_LT;
+    } else if (c1 == '>' && c2 == '>') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_GT_GT;
+    } else if (c1 == '&' && c2 == '&') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_AND_AND;
+    } else if (c1 == '|' && c2 == '|') {
+        shift(2);
+        return QDeclarativeJSGrammar::T_OR_OR;
+    }
+
+    switch(c1) {
+        case '=': shift(1); return QDeclarativeJSGrammar::T_EQ;
+        case '>': shift(1); return QDeclarativeJSGrammar::T_GT;
+        case '<': shift(1); return QDeclarativeJSGrammar::T_LT;
+        case ',': shift(1); return QDeclarativeJSGrammar::T_COMMA;
+        case '!': shift(1); return QDeclarativeJSGrammar::T_NOT;
+        case '~': shift(1); return QDeclarativeJSGrammar::T_TILDE;
+        case '?': shift(1); return QDeclarativeJSGrammar::T_QUESTION;
+        case ':': shift(1); return QDeclarativeJSGrammar::T_COLON;
+        case '.': shift(1); return QDeclarativeJSGrammar::T_DOT;
+        case '+': shift(1); return QDeclarativeJSGrammar::T_PLUS;
+        case '-': shift(1); return QDeclarativeJSGrammar::T_MINUS;
+        case '*': shift(1); return QDeclarativeJSGrammar::T_STAR;
+        case '/': shift(1); return QDeclarativeJSGrammar::T_DIVIDE_;
+        case '&': shift(1); return QDeclarativeJSGrammar::T_AND;
+        case '|': shift(1); return QDeclarativeJSGrammar::T_OR;
+        case '^': shift(1); return QDeclarativeJSGrammar::T_XOR;
+        case '%': shift(1); return QDeclarativeJSGrammar::T_REMAINDER;
+        case '(': shift(1); return QDeclarativeJSGrammar::T_LPAREN;
+        case ')': shift(1); return QDeclarativeJSGrammar::T_RPAREN;
+        case '{': shift(1); return QDeclarativeJSGrammar::T_LBRACE;
+        case '}': shift(1); return QDeclarativeJSGrammar::T_RBRACE;
+        case '[': shift(1); return QDeclarativeJSGrammar::T_LBRACKET;
+        case ']': shift(1); return QDeclarativeJSGrammar::T_RBRACKET;
+        case ';': shift(1); return QDeclarativeJSGrammar::T_SEMICOLON;
+
+        default: return -1;
+    }
+}
+
+ushort Lexer::singleEscape(ushort c) const
+{
+    switch(c) {
+    case 'b':
+        return 0x08;
+    case 't':
+        return 0x09;
+    case 'n':
+        return 0x0A;
+    case 'v':
+        return 0x0B;
+    case 'f':
+        return 0x0C;
+    case 'r':
+        return 0x0D;
+    case '"':
+        return 0x22;
+    case '\'':
+        return 0x27;
+    case '\\':
+        return 0x5C;
+    default:
+        return c;
+    }
+}
+
+ushort Lexer::convertOctal(ushort c1, ushort c2,
+                            ushort c3) const
+{
+    return ((c1 - '0') * 64 + (c2 - '0') * 8 + c3 - '0');
+}
+
+unsigned char Lexer::convertHex(ushort c)
+{
+    if (c >= '0' && c <= '9')
+        return (c - '0');
+    else if (c >= 'a' && c <= 'f')
+        return (c - 'a' + 10);
+    else
+        return (c - 'A' + 10);
+}
+
+unsigned char Lexer::convertHex(ushort c1, ushort c2)
+{
+    return ((convertHex(c1) << 4) + convertHex(c2));
+}
+
+QChar Lexer::convertUnicode(ushort c1, ushort c2,
+                             ushort c3, ushort c4)
+{
+    return QChar((convertHex(c3) << 4) + convertHex(c4),
+                  (convertHex(c1) << 4) + convertHex(c2));
+}
+
+void Lexer::record8(ushort c)
+{
+    Q_ASSERT(c <= 0xff);
+
+    // enlarge buffer if full
+    if (pos8 >= size8 - 1) {
+        char *tmp = new char[2 * size8];
+        memcpy(tmp, buffer8, size8 * sizeof(char));
+        delete [] buffer8;
+        buffer8 = tmp;
+        size8 *= 2;
+    }
+
+    buffer8[pos8++] = (char) c;
+}
+
+void Lexer::record16(QChar c)
+{
+    // enlarge buffer if full
+    if (pos16 >= size16 - 1) {
+        QChar *tmp = new QChar[2 * size16];
+        memcpy(tmp, buffer16, size16 * sizeof(QChar));
+        delete [] buffer16;
+        buffer16 = tmp;
+        size16 *= 2;
+    }
+
+    buffer16[pos16++] = c;
+}
+
+void Lexer::recordStartPos()
+{
+    startpos = pos;
+    startlineno = yylineno;
+    startcolumn = yycolumn;
+}
+
+bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
+{
+    pos16 = 0;
+    pattern = 0;
+
+    if (prefix == EqualPrefix)
+        record16(QLatin1Char('='));
+
+    while (true) {
+        switch (current) {
+
+        case 0: // eof
+        case '\n': case '\r': // line terminator
+            errmsg = QCoreApplication::translate("QDeclarativeParser", "Unterminated regular expression literal");
+            return false;
+
+        case '/':
+            shift(1);
+
+            if (driver) // create the pattern
+                pattern = driver->intern(buffer16, pos16);
+
+            // scan the flags
+            pos16 = 0;
+            flags = 0;
+            while (isIdentLetter(current)) {
+                int flag = Ecma::RegExp::flagFromChar(current);
+                if (flag == 0) {
+                    errmsg = QCoreApplication::translate("QDeclarativeParser", "Invalid regular expression flag '%0'")
+                             .arg(QChar(current));
+                    return false;
+                }
+                flags |= flag;
+                record16(current);
+                shift(1);
+            }
+            return true;
+
+        case '\\':
+            // regular expression backslash sequence
+            record16(current);
+            shift(1);
+
+            if (! current || isLineTerminator()) {
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unterminated regular expression backslash sequence");
+                return false;
+            }
+
+            record16(current);
+            shift(1);
+            break;
+
+        case '[':
+            // regular expression class
+            record16(current);
+            shift(1);
+
+            while (current && ! isLineTerminator()) {
+                if (current == ']')
+                    break;
+                else if (current == '\\') {
+                    // regular expression backslash sequence
+                    record16(current);
+                    shift(1);
+
+                    if (! current || isLineTerminator()) {
+                        errmsg = QCoreApplication::translate("QDeclarativeParser", "Unterminated regular expression backslash sequence");
+                        return false;
+                    }
+
+                    record16(current);
+                    shift(1);
+                } else {
+                    record16(current);
+                    shift(1);
+                }
+            }
+
+            if (current != ']') {
+                errmsg = QCoreApplication::translate("QDeclarativeParser", "Unterminated regular expression class");
+                return false;
+            }
+
+            record16(current);
+            shift(1); // skip ]
+            break;
+
+        default:
+            record16(current);
+            shift(1);
+        } // switch
+    } // while
+
+    return false;
+}
+
+void Lexer::syncProhibitAutomaticSemicolon()
+{
+    if (parenthesesState == BalancedParentheses) {
+        // we have seen something like "if (foo)", which means we should
+        // never insert an automatic semicolon at this point, since it would
+        // then be expanded into an empty statement (ECMA-262 7.9.1)
+        prohibitAutomaticSemicolon = true;
+        parenthesesState = IgnoreParentheses;
+    } else {
+        prohibitAutomaticSemicolon = false;
+    }
+}
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejslexer_p.h b/tools/qdoc3/declarativeparser/qdeclarativejslexer_p.h
new file mode 100644
index 0000000..8febb54
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejslexer_p.h
@@ -0,0 +1,249 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSLEXER_P_H
+#define QDECLARATIVEJSLEXER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Lexer
+{
+public:
+    Lexer(Engine *eng, bool tokenizeComments = false);
+    ~Lexer();
+
+    void setCode(const QString &c, int lineno);
+    int lex();
+
+    int currentLineNo() const { return yylineno; }
+    int currentColumnNo() const { return yycolumn; }
+
+    int tokenOffset() const { return startpos; }
+    int tokenLength() const { return pos - startpos; }
+
+    int startLineNo() const { return startlineno; }
+    int startColumnNo() const { return startcolumn; }
+
+    int endLineNo() const { return currentLineNo(); }
+    int endColumnNo() const
+    { int col = currentColumnNo(); return (col > 0) ? col - 1 : col; }
+
+    bool prevTerminator() const { return terminator; }
+
+    enum State { Start,
+                 Identifier,
+                 InIdentifier,
+                 InSingleLineComment,
+                 InMultiLineComment,
+                 InNum,
+                 InNum0,
+                 InHex,
+                 InOctal,
+                 InDecimal,
+                 InExponentIndicator,
+                 InExponent,
+                 Hex,
+                 Octal,
+                 Number,
+                 String,
+                 Eof,
+                 InString,
+                 InEscapeSequence,
+                 InHexEscape,
+                 InUnicodeEscape,
+                 Other,
+                 Bad };
+
+    enum Error {
+        NoError,
+        IllegalCharacter,
+        UnclosedStringLiteral,
+        IllegalEscapeSequence,
+        IllegalUnicodeEscapeSequence,
+        UnclosedComment,
+        IllegalExponentIndicator,
+        IllegalIdentifier
+    };
+
+    enum ParenthesesState {
+        IgnoreParentheses,
+        CountParentheses,
+        BalancedParentheses
+    };
+
+    enum RegExpBodyPrefix {
+        NoPrefix,
+        EqualPrefix
+    };
+
+    bool scanRegExp(RegExpBodyPrefix prefix = NoPrefix);
+
+    NameId *pattern;
+    int flags;
+
+    State lexerState() const
+        { return state; }
+
+    QString errorMessage() const
+        { return errmsg; }
+    void setErrorMessage(const QString &err)
+        { errmsg = err; }
+    void setErrorMessage(const char *err)
+        { setErrorMessage(QString::fromLatin1(err)); }
+
+    Error error() const
+        { return err; }
+    void clearError()
+        { err = NoError; }
+
+private:
+    Engine *driver;
+    int yylineno;
+    bool done;
+    char *buffer8;
+    QChar *buffer16;
+    uint size8, size16;
+    uint pos8, pos16;
+    bool terminator;
+    bool restrKeyword;
+    // encountered delimiter like "'" and "}" on last run
+    bool delimited;
+    int stackToken;
+
+    State state;
+    void setDone(State s);
+    uint pos;
+    void shift(uint p);
+    int lookupKeyword(const char *);
+
+    bool isWhiteSpace() const;
+    bool isLineTerminator() const;
+    bool isHexDigit(ushort c) const;
+    bool isOctalDigit(ushort c) const;
+
+    int matchPunctuator(ushort c1, ushort c2,
+                         ushort c3, ushort c4);
+    ushort singleEscape(ushort c) const;
+    ushort convertOctal(ushort c1, ushort c2,
+                         ushort c3) const;
+public:
+    static unsigned char convertHex(ushort c1);
+    static unsigned char convertHex(ushort c1, ushort c2);
+    static QChar convertUnicode(ushort c1, ushort c2,
+                                 ushort c3, ushort c4);
+    static bool isIdentLetter(ushort c);
+    static bool isDecimalDigit(ushort c);
+
+    inline int ival() const { return qsyylval.ival; }
+    inline double dval() const { return qsyylval.dval; }
+    inline NameId *ustr() const { return qsyylval.ustr; }
+
+    const QChar *characterBuffer() const { return buffer16; }
+    int characterCount() const { return pos16; }
+
+private:
+    void record8(ushort c);
+    void record16(QChar c);
+    void recordStartPos();
+
+    int findReservedWord(const QChar *buffer, int size) const;
+
+    void syncProhibitAutomaticSemicolon();
+
+    const QChar *code;
+    uint length;
+    int yycolumn;
+    int startpos;
+    int startlineno;
+    int startcolumn;
+    int bol;     // begin of line
+
+    union {
+        int ival;
+        double dval;
+        NameId *ustr;
+    } qsyylval;
+
+    // current and following unicode characters
+    ushort current, next1, next2, next3;
+
+    struct keyword {
+        const char *name;
+        int token;
+    };
+
+    QString errmsg;
+    Error err;
+
+    bool wantRx;
+    bool check_reserved;
+
+    ParenthesesState parenthesesState;
+    int parenthesesCount;
+    bool prohibitAutomaticSemicolon;
+    bool tokenizeComments;
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsmemorypool_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsmemorypool_p.h
new file mode 100644
index 0000000..ebf75d1
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsmemorypool_p.h
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSMEMORYPOOL_P_H
+#define QDECLARATIVEJSMEMORYPOOL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+
+#include <QtCore/qglobal.h>
+#include <QtCore/qshareddata.h>
+
+#include <string.h>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class QML_PARSER_EXPORT MemoryPool : public QSharedData
+{
+public:
+    enum { maxBlockCount = -1 };
+    enum { defaultBlockSize = 1 << 12 };
+
+    MemoryPool() {
+        m_blockIndex = maxBlockCount;
+        m_currentIndex = 0;
+        m_storage = 0;
+        m_currentBlock = 0;
+        m_currentBlockSize = 0;
+    }
+
+    virtual ~MemoryPool() {
+        for (int index = 0; index < m_blockIndex + 1; ++index)
+            qFree(m_storage[index]);
+
+        qFree(m_storage);
+    }
+
+    char *allocate(int bytes) {
+        bytes += (8 - bytes) & 7; // ensure multiple of 8 bytes (maintain alignment)
+        if (m_currentBlock == 0 || m_currentBlockSize < m_currentIndex + bytes) {
+            ++m_blockIndex;
+            m_currentBlockSize = defaultBlockSize << m_blockIndex;
+
+            m_storage = reinterpret_cast<char**>(qRealloc(m_storage, sizeof(char*) * (1 + m_blockIndex)));
+            m_currentBlock = m_storage[m_blockIndex] = reinterpret_cast<char*>(qMalloc(m_currentBlockSize));
+            ::memset(m_currentBlock, 0, m_currentBlockSize);
+
+            m_currentIndex = (8 - quintptr(m_currentBlock)) & 7; // ensure first chunk is 64-bit aligned
+            Q_ASSERT(m_currentIndex + bytes <= m_currentBlockSize);
+        }
+
+        char *p = reinterpret_cast<char *>
+            (m_currentBlock + m_currentIndex);
+
+        m_currentIndex += bytes;
+
+        return p;
+    }
+
+    int bytesAllocated() const {
+        int bytes = 0;
+        for (int index = 0; index < m_blockIndex; ++index)
+            bytes += (defaultBlockSize << index);
+        bytes += m_currentIndex;
+        return bytes;
+    }
+
+private:
+    int m_blockIndex;
+    int m_currentIndex;
+    char *m_currentBlock;
+    int m_currentBlockSize;
+    char **m_storage;
+
+private:
+    Q_DISABLE_COPY(MemoryPool)
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsnodepool_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsnodepool_p.h
new file mode 100644
index 0000000..ca3841c
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsnodepool_p.h
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEJSNODEPOOL_P_H
+#define QDECLARATIVEJSNODEPOOL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsmemorypool_p.h"
+
+#include <QtCore/QHash>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+namespace AST {
+class Node;
+} // namespace AST
+
+class Code;
+class CompilationUnit;
+class Engine;
+
+template <typename NodeType>
+inline NodeType *makeAstNode(MemoryPool *storage)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType();
+    return node;
+}
+
+template <typename NodeType, typename Arg1>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2, typename Arg3>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3);
+    return node;
+}
+
+template <typename NodeType, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+inline NodeType *makeAstNode(MemoryPool *storage, Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4)
+{
+    NodeType *node = new (storage->allocate(sizeof(NodeType))) NodeType(arg1, arg2, arg3, arg4);
+    return node;
+}
+
+class QML_PARSER_EXPORT NodePool : public MemoryPool
+{
+public:
+    NodePool(const QString &fileName, Engine *engine);
+    virtual ~NodePool();
+
+    Code *createCompiledCode(AST::Node *node, CompilationUnit &compilation);
+
+    inline QString fileName() const { return m_fileName; }
+    inline Engine *engine() const { return m_engine; }
+#ifndef J_SCRIPT_NO_EVENT_NOTIFY
+    inline qint64 id() const { return m_id; }
+#endif
+
+private:
+    QHash<AST::Node*, Code*> m_codeCache;
+    QString m_fileName;
+    Engine *m_engine;
+#ifndef J_SCRIPT_NO_EVENT_NOTIFY
+    qint64 m_id;
+#endif
+
+private:
+    Q_DISABLE_COPY(NodePool)
+};
+
+} // namespace QDeclarativeJS
+
+QT_QML_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsparser.cpp b/tools/qdoc3/declarativeparser/qdeclarativejsparser.cpp
new file mode 100644
index 0000000..118dcc6
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsparser.cpp
@@ -0,0 +1,1904 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QtDebug>
+#include <QtGui/QApplication>
+
+#include <string.h>
+
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativejslexer_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsnodepool_p.h"
+
+
+
+#include "qdeclarativejsparser_p.h"
+#include <QVarLengthArray>
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+using namespace QDeclarativeJS;
+
+QT_QML_BEGIN_NAMESPACE
+
+void Parser::reallocateStack()
+{
+    if (! stack_size)
+        stack_size = 128;
+    else
+        stack_size <<= 1;
+
+    sym_stack = reinterpret_cast<Value*> (qRealloc(sym_stack, stack_size * sizeof(Value)));
+    state_stack = reinterpret_cast<int*> (qRealloc(state_stack, stack_size * sizeof(int)));
+    location_stack = reinterpret_cast<AST::SourceLocation*> (qRealloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
+}
+
+inline static bool automatic(Engine *driver, int token)
+{
+    return token == QDeclarativeJSGrammar::T_RBRACE
+        || token == 0
+        || driver->lexer()->prevTerminator();
+}
+
+
+Parser::Parser(Engine *engine):
+    driver(engine),
+    tos(0),
+    stack_size(0),
+    sym_stack(0),
+    state_stack(0),
+    location_stack(0),
+    first_token(0),
+    last_token(0)
+{
+}
+
+Parser::~Parser()
+{
+    if (stack_size) {
+        qFree(sym_stack);
+        qFree(state_stack);
+        qFree(location_stack);
+    }
+}
+
+static inline AST::SourceLocation location(Lexer *lexer)
+{
+    AST::SourceLocation loc;
+    loc.offset = lexer->tokenOffset();
+    loc.length = lexer->tokenLength();
+    loc.startLine = lexer->startLineNo();
+    loc.startColumn = lexer->startColumnNo();
+    return loc;
+}
+
+AST::UiQualifiedId *Parser::reparseAsQualifiedId(AST::ExpressionNode *expr)
+{
+    QVarLengthArray<NameId *, 4> nameIds;
+    QVarLengthArray<AST::SourceLocation, 4> locations;
+
+    AST::ExpressionNode *it = expr;
+    while (AST::FieldMemberExpression *m = AST::cast<AST::FieldMemberExpression *>(it)) {
+        nameIds.append(m->name);
+        locations.append(m->identifierToken);
+        it = m->base;
+    }
+
+    if (AST::IdentifierExpression *idExpr = AST::cast<AST::IdentifierExpression *>(it)) {
+        AST::UiQualifiedId *q = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), idExpr->name);
+        q->identifierToken = idExpr->identifierToken;
+
+        AST::UiQualifiedId *currentId = q;
+        for (int i = nameIds.size() - 1; i != -1; --i) {
+            currentId = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), currentId, nameIds[i]);
+            currentId->identifierToken = locations[i];
+        }
+
+        return currentId->finish();
+    }
+
+    return 0;
+}
+
+bool Parser::parse(int startToken)
+{
+    Lexer *lexer = driver->lexer();
+    bool hadErrors = false;
+    int yytoken = -1;
+    int action = 0;
+
+    token_buffer[0].token = startToken;
+    first_token = &token_buffer[0];
+    last_token = &token_buffer[1];
+
+    tos = -1;
+    program = 0;
+
+    do {
+        if (++tos == stack_size)
+            reallocateStack();
+
+        state_stack[tos] = action;
+
+    _Lcheck_token:
+        if (yytoken == -1 && -TERMINAL_COUNT != action_index[action]) {
+            yyprevlloc = yylloc;
+
+            if (first_token == last_token) {
+                yytoken = lexer->lex();
+                yylval = lexer->dval();
+                yylloc = location(lexer);
+            } else {
+                yytoken = first_token->token;
+                yylval = first_token->dval;
+                yylloc = first_token->loc;
+                ++first_token;
+            }
+        }
+
+        action = t_action(action, yytoken);
+        if (action > 0) {
+            if (action != ACCEPT_STATE) {
+                yytoken = -1;
+                sym(1).dval = yylval;
+                loc(1) = yylloc;
+            } else {
+              --tos;
+              return ! hadErrors;
+            }
+        } else if (action < 0) {
+          const int r = -action - 1;
+          tos -= rhs[r];
+
+          switch (r) {
+
+case 0: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 1: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 2: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 3: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 4: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 5: {
+  sym(1).Node = sym(2).Node;
+  program = sym(1).Node;
+} break;
+
+case 6: {
+  sym(1).UiProgram = makeAstNode<AST::UiProgram> (driver->nodePool(), sym(1).UiImportList,
+        sym(2).UiObjectMemberList->finish());
+} break;
+
+case 8: {
+    sym(1).Node = sym(1).UiImportList->finish();
+} break;
+
+case 9: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(), sym(1).UiImport);
+} break;
+
+case 10: {
+    sym(1).Node = makeAstNode<AST::UiImportList> (driver->nodePool(),
+        sym(1).UiImportList, sym(2).UiImport);
+} break;
+
+case 13: {
+    sym(1).UiImport->semicolonToken = loc(2);
+} break;
+
+case 15: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->semicolonToken = loc(3);
+} break;
+
+case 17: {
+    sym(1).UiImport->versionToken = loc(2);
+    sym(1).UiImport->asToken = loc(3);
+    sym(1).UiImport->importIdToken = loc(4);
+    sym(1).UiImport->importId = sym(4).sval;
+    sym(1).UiImport->semicolonToken = loc(5);
+} break;
+
+case 19: {
+    sym(1).UiImport->asToken = loc(2);
+    sym(1).UiImport->importIdToken = loc(3);
+    sym(1).UiImport->importId = sym(3).sval;
+    sym(1).UiImport->semicolonToken = loc(4);
+} break;
+
+case 20: {
+    AST::UiImport *node = 0;
+
+    if (AST::StringLiteral *importIdLiteral = AST::cast<AST::StringLiteral *>(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), importIdLiteral->value);
+        node->fileNameToken = loc(2);
+    } else if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(2).Expression)) {
+        node = makeAstNode<AST::UiImport>(driver->nodePool(), qualifiedId);
+        node->fileNameToken = loc(2);
+    }
+
+    sym(1).Node = node;
+
+    if (node) {
+        node->importToken = loc(1);
+    } else {
+       diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+         QLatin1String("Expected a qualified name id or a string literal")));
+
+        return false; // ### remove me
+    }
+} break;
+
+case 21: {
+    sym(1).Node = 0;
+} break;
+
+case 22: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 23: {
+    sym(1).Node = makeAstNode<AST::UiObjectMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 24: {
+    AST::UiObjectMemberList *node = makeAstNode<AST:: UiObjectMemberList> (driver->nodePool(),
+        sym(1).UiObjectMemberList, sym(2).UiObjectMember);
+    sym(1).Node = node;
+} break;
+
+case 25: {
+    sym(1).Node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), sym(1).UiObjectMember);
+} break;
+
+case 26: {
+    AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(),
+        sym(1).UiArrayMemberList, sym(3).UiObjectMember);
+    node->commaToken = loc(2);
+    sym(1).Node = node;
+} break;
+
+case 27: {
+    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0);
+    node->lbraceToken = loc(1);
+    node->rbraceToken = loc(2);
+    sym(1).Node = node;
+}   break;
+
+case 28: {
+    AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), sym(2).UiObjectMemberList->finish());
+    node->lbraceToken = loc(1);
+    node->rbraceToken = loc(3);
+    sym(1).Node = node;
+}   break;
+
+case 29: {
+    AST::UiObjectDefinition *node = makeAstNode<AST::UiObjectDefinition> (driver->nodePool(), sym(1).UiQualifiedId,
+        sym(2).UiObjectInitializer);
+    sym(1).Node = node;
+}   break;
+
+case 31: {
+    AST::UiArrayBinding *node = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(4).UiArrayMemberList->finish());
+    node->colonToken = loc(2);
+    node->lbracketToken = loc(3);
+    node->rbracketToken = loc(5);
+    sym(1).Node = node;
+}   break;
+
+case 32: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(1).UiQualifiedId, sym(3).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+} break;
+
+case 33: {
+    AST::UiObjectBinding *node = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      sym(3).UiQualifiedId, sym(1).UiQualifiedId, sym(4).UiObjectInitializer);
+    node->colonToken = loc(2);
+    node->hasOnToken = true;
+    sym(1).Node = node;
+} break;
+case 34:case 35:case 36:case 37:
+{
+    AST::UiScriptBinding *node = makeAstNode<AST::UiScriptBinding> (driver->nodePool(),
+        sym(1).UiQualifiedId, sym(3).Statement);
+    node->colonToken = loc(2);
+    sym(1).Node = node;
+}   break;
+
+case 38:
+
+case 39: {
+    sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+    break;
+}
+
+case 41: {
+  sym(1).Node = 0;
+} break;
+
+case 42: {
+  sym(1).Node = sym(1).UiParameterList->finish ();
+} break;
+
+case 43: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).sval, sym(2).sval);
+  node->identifierToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 44: {
+  AST::UiParameterList *node = makeAstNode<AST::UiParameterList> (driver->nodePool(), sym(1).UiParameterList, sym(3).sval, sym(4).sval);
+  node->commaToken = loc(2);
+  node->identifierToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 46: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->parameters = sym(4).UiParameterList;
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+
+case 48: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), (NameId *)0, sym(2).sval);
+    node->type = AST::UiPublicMember::Signal;
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(2);
+    node->semicolonToken = loc(3);
+    sym(1).Node = node;
+}   break;
+
+case 50: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 52: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4);
+    sym(1).Node = node;
+}   break;
+
+case 54: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->semicolonToken = loc(5);
+    sym(1).Node = node;
+}   break;
+
+case 56: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval,
+        sym(5).Expression);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->colonToken = loc(4);
+    node->semicolonToken = loc(6);
+    sym(1).Node = node;
+}   break;
+
+case 58: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isReadonlyMember = true;
+    node->readonlyToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 60: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(3).sval, sym(4).sval,
+        sym(6).Expression);
+    node->isDefaultMember = true;
+    node->defaultToken = loc(1);
+    node->propertyToken = loc(2);
+    node->typeToken = loc(3);
+    node->identifierToken = loc(4);
+    node->colonToken = loc(5);
+    node->semicolonToken = loc(7);
+    sym(1).Node = node;
+}   break;
+
+case 61: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(4).sval, sym(6).sval);
+    node->typeModifier = sym(2).sval;
+    node->propertyToken = loc(1);
+    node->typeModifierToken = loc(2);
+    node->typeToken = loc(4);
+    node->identifierToken = loc(6);
+    node->semicolonToken = loc(7); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), sym(6).sval);
+    propertyName->identifierToken = loc(6);
+    propertyName->next = 0;
+
+    AST::UiArrayBinding *binding = makeAstNode<AST::UiArrayBinding> (driver->nodePool(),
+        propertyName, sym(9).UiArrayMemberList->finish());
+    binding->colonToken = loc(7);
+    binding->lbracketToken = loc(8);
+    binding->rbracketToken = loc(10);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
+}   break;
+
+case 62: {
+    AST::UiPublicMember *node = makeAstNode<AST::UiPublicMember> (driver->nodePool(), sym(2).sval, sym(3).sval);
+    node->propertyToken = loc(1);
+    node->typeToken = loc(2);
+    node->identifierToken = loc(3);
+    node->semicolonToken = loc(4); // insert a fake ';' before ':'
+
+    AST::UiQualifiedId *propertyName = makeAstNode<AST::UiQualifiedId>(driver->nodePool(), sym(3).sval);
+    propertyName->identifierToken = loc(3);
+    propertyName->next = 0;
+
+    AST::UiObjectBinding *binding = makeAstNode<AST::UiObjectBinding> (driver->nodePool(),
+      propertyName, sym(5).UiQualifiedId, sym(6).UiObjectInitializer);
+    binding->colonToken = loc(4);
+
+    node->binding = binding;
+
+    sym(1).Node = node;
+}   break;
+
+case 63: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+
+case 64: {
+    sym(1).Node = makeAstNode<AST::UiSourceElement>(driver->nodePool(), sym(1).Node);
+}   break;
+
+case 66: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_PROPERTY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 67: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_SIGNAL]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 68: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_READONLY]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 69: {
+    QString s = QLatin1String(QDeclarativeJSGrammar::spell[T_ON]);
+    sym(1).sval = driver->intern(s.constData(), s.length());
+    break;
+}
+
+case 70: {
+  AST::ThisExpression *node = makeAstNode<AST::ThisExpression> (driver->nodePool());
+  node->thisToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 71: {
+  AST::IdentifierExpression *node = makeAstNode<AST::IdentifierExpression> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 72: {
+  AST::NullExpression *node = makeAstNode<AST::NullExpression> (driver->nodePool());
+  node->nullToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 73: {
+  AST::TrueLiteral *node = makeAstNode<AST::TrueLiteral> (driver->nodePool());
+  node->trueToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 74: {
+  AST::FalseLiteral *node = makeAstNode<AST::FalseLiteral> (driver->nodePool());
+  node->falseToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 75: {
+  AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+case 76:
+case 77: {
+  AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 78: {
+  bool rx = lexer->scanRegExp(Lexer::NoPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false; // ### remove me
+  }
+
+  loc(1).length = lexer->tokenLength();
+
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 79: {
+  bool rx = lexer->scanRegExp(Lexer::EqualPrefix);
+  if (!rx) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, location(lexer), lexer->errorMessage()));
+    return false;
+  }
+
+  loc(1).length = lexer->tokenLength();
+
+  AST::RegExpLiteral *node = makeAstNode<AST::RegExpLiteral> (driver->nodePool(), lexer->pattern, lexer->flags);
+  node->literalToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 80: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 81: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 82: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish ());
+  node->lbracketToken = loc(1);
+  node->rbracketToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 83: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    (AST::Elision *) 0);
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 84: {
+  AST::ArrayLiteral *node = makeAstNode<AST::ArrayLiteral> (driver->nodePool(), sym(2).ElementList->finish (),
+    sym(4).Elision->finish());
+  node->lbracketToken = loc(1);
+  node->commaToken = loc(3);
+  node->rbracketToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 85: {
+  AST::ObjectLiteral *node = 0;
+  if (sym(2).Node)
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+        sym(2).PropertyNameAndValueList->finish ());
+  else
+    node = makeAstNode<AST::ObjectLiteral> (driver->nodePool());
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 86: {
+  AST::ObjectLiteral *node = makeAstNode<AST::ObjectLiteral> (driver->nodePool(),
+    sym(2).PropertyNameAndValueList->finish ());
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 87: {
+  AST::NestedExpression *node = makeAstNode<AST::NestedExpression>(driver->nodePool(), sym(2).Expression);
+  node->lparenToken = loc(1);
+  node->rparenToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 88: {
+  if (AST::ArrayMemberExpression *mem = AST::cast<AST::ArrayMemberExpression *>(sym(1).Expression)) {
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, mem->lbracketToken,
+      QLatin1String("Ignored annotation")));
+
+    sym(1).Expression = mem->base;
+  }
+
+  if (AST::UiQualifiedId *qualifiedId = reparseAsQualifiedId(sym(1).Expression)) {
+    sym(1).UiQualifiedId = qualifiedId;
+  } else {
+    sym(1).UiQualifiedId = 0;
+
+    diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, loc(1),
+      QLatin1String("Expected a qualified name id")));
+
+    return false; // ### recover
+  }
+} break;
+
+case 89: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), (AST::Elision *) 0, sym(1).Expression);
+} break;
+
+case 90: {
+  sym(1).Node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).Elision->finish(), sym(2).Expression);
+} break;
+
+case 91: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList,
+    (AST::Elision *) 0, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 92: {
+  AST::ElementList *node = makeAstNode<AST::ElementList> (driver->nodePool(), sym(1).ElementList, sym(3).Elision->finish(),
+    sym(4).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 93: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool());
+  node->commaToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 94: {
+  AST::Elision *node = makeAstNode<AST::Elision> (driver->nodePool(), sym(1).Elision);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 95: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyName, sym(3).Expression);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 96: {
+  AST::PropertyNameAndValueList *node = makeAstNode<AST::PropertyNameAndValueList> (driver->nodePool(),
+      sym(1).PropertyNameAndValueList, sym(3).PropertyName, sym(5).Expression);
+  node->commaToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 97: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+case 98:
+case 99: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()));
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 100: {
+  AST::StringLiteralPropertyName *node = makeAstNode<AST::StringLiteralPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 101: {
+  AST::NumericLiteralPropertyName *node = makeAstNode<AST::NumericLiteralPropertyName> (driver->nodePool(), sym(1).dval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 102: {
+  AST::IdentifierPropertyName *node = makeAstNode<AST::IdentifierPropertyName> (driver->nodePool(), sym(1).sval);
+  node->propertyNameToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 103:
+
+case 104:
+
+case 105:
+
+case 106:
+
+case 107:
+
+case 108:
+
+case 109:
+
+case 110:
+
+case 111:
+
+case 112:
+
+case 113:
+
+case 114:
+
+case 115:
+
+case 116:
+
+case 117:
+
+case 118:
+
+case 119:
+
+case 120:
+
+case 121:
+
+case 122:
+
+case 123:
+
+case 124:
+
+case 125:
+
+case 126:
+
+case 127:
+
+case 128:
+
+case 129:
+
+case 130:
+
+case 131:
+
+case 132:
+
+case 133:
+{
+  sym(1).sval = driver->intern(lexer->characterBuffer(), lexer->characterCount());
+} break;
+
+case 138: {
+  AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->lbracketToken = loc(2);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 139: {
+  AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
+  node->dotToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 140: {
+  AST::NewMemberExpression *node = makeAstNode<AST::NewMemberExpression> (driver->nodePool(), sym(2).Expression, sym(4).ArgumentList);
+  node->newToken = loc(1);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 142: {
+  AST::NewExpression *node = makeAstNode<AST::NewExpression> (driver->nodePool(), sym(2).Expression);
+  node->newToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 143: {
+  AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 144: {
+  AST::CallExpression *node = makeAstNode<AST::CallExpression> (driver->nodePool(), sym(1).Expression, sym(3).ArgumentList);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 145: {
+  AST::ArrayMemberExpression *node = makeAstNode<AST::ArrayMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->lbracketToken = loc(2);
+  node->rbracketToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 146: {
+  AST::FieldMemberExpression *node = makeAstNode<AST::FieldMemberExpression> (driver->nodePool(), sym(1).Expression, sym(3).sval);
+  node->dotToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 147: {
+  sym(1).Node = 0;
+} break;
+
+case 148: {
+  sym(1).Node = sym(1).ArgumentList->finish();
+} break;
+
+case 149: {
+  sym(1).Node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).Expression);
+} break;
+
+case 150: {
+  AST::ArgumentList *node = makeAstNode<AST::ArgumentList> (driver->nodePool(), sym(1).ArgumentList, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 154: {
+  AST::PostIncrementExpression *node = makeAstNode<AST::PostIncrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->incrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 155: {
+  AST::PostDecrementExpression *node = makeAstNode<AST::PostDecrementExpression> (driver->nodePool(), sym(1).Expression);
+  node->decrementToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 157: {
+  AST::DeleteExpression *node = makeAstNode<AST::DeleteExpression> (driver->nodePool(), sym(2).Expression);
+  node->deleteToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 158: {
+  AST::VoidExpression *node = makeAstNode<AST::VoidExpression> (driver->nodePool(), sym(2).Expression);
+  node->voidToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 159: {
+  AST::TypeOfExpression *node = makeAstNode<AST::TypeOfExpression> (driver->nodePool(), sym(2).Expression);
+  node->typeofToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 160: {
+  AST::PreIncrementExpression *node = makeAstNode<AST::PreIncrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->incrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 161: {
+  AST::PreDecrementExpression *node = makeAstNode<AST::PreDecrementExpression> (driver->nodePool(), sym(2).Expression);
+  node->decrementToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 162: {
+  AST::UnaryPlusExpression *node = makeAstNode<AST::UnaryPlusExpression> (driver->nodePool(), sym(2).Expression);
+  node->plusToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 163: {
+  AST::UnaryMinusExpression *node = makeAstNode<AST::UnaryMinusExpression> (driver->nodePool(), sym(2).Expression);
+  node->minusToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 164: {
+  AST::TildeExpression *node = makeAstNode<AST::TildeExpression> (driver->nodePool(), sym(2).Expression);
+  node->tildeToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 165: {
+  AST::NotExpression *node = makeAstNode<AST::NotExpression> (driver->nodePool(), sym(2).Expression);
+  node->notToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 167: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Mul, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 168: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Div, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 169: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Mod, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 171: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Add, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 172: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Sub, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 174: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::LShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 175: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::RShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 176: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::URShift, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 178: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Lt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 179: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Gt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 180: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Le, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 181: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Ge, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 182: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::InstanceOf, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 183: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::In, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 185: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Lt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 186: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Gt, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 187: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Le, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 188: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+   QSOperator::Ge, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 189: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::InstanceOf, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 191: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Equal, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 192: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::NotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 193: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 194: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictNotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 196: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Equal, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 197: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::NotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 198: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 199: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::StrictNotEqual, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 201: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitAnd, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 203: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitAnd, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 205: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitXor, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 207: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitXor, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 209: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitOr, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 211: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::BitOr, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 213: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::And, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 215: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::And, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 217: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Or, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 219: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    QSOperator::Or, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 221: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 223: {
+  AST::ConditionalExpression *node = makeAstNode<AST::ConditionalExpression> (driver->nodePool(), sym(1).Expression,
+    sym(3).Expression, sym(5).Expression);
+  node->questionToken = loc(2);
+  node->colonToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 225: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    sym(2).ival, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 227: {
+  AST::BinaryExpression *node = makeAstNode<AST::BinaryExpression> (driver->nodePool(), sym(1).Expression,
+    sym(2).ival, sym(3).Expression);
+  node->operatorToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 228: {
+  sym(1).ival = QSOperator::Assign;
+} break;
+
+case 229: {
+  sym(1).ival = QSOperator::InplaceMul;
+} break;
+
+case 230: {
+  sym(1).ival = QSOperator::InplaceDiv;
+} break;
+
+case 231: {
+  sym(1).ival = QSOperator::InplaceMod;
+} break;
+
+case 232: {
+  sym(1).ival = QSOperator::InplaceAdd;
+} break;
+
+case 233: {
+  sym(1).ival = QSOperator::InplaceSub;
+} break;
+
+case 234: {
+  sym(1).ival = QSOperator::InplaceLeftShift;
+} break;
+
+case 235: {
+  sym(1).ival = QSOperator::InplaceRightShift;
+} break;
+
+case 236: {
+  sym(1).ival = QSOperator::InplaceURightShift;
+} break;
+
+case 237: {
+  sym(1).ival = QSOperator::InplaceAnd;
+} break;
+
+case 238: {
+  sym(1).ival = QSOperator::InplaceXor;
+} break;
+
+case 239: {
+  sym(1).ival = QSOperator::InplaceOr;
+} break;
+
+case 241: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 242: {
+  sym(1).Node = 0;
+} break;
+
+case 245: {
+  AST::Expression *node = makeAstNode<AST::Expression> (driver->nodePool(), sym(1).Expression, sym(3).Expression);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 246: {
+  sym(1).Node = 0;
+} break;
+
+case 263: {
+  AST::Block *node = makeAstNode<AST::Block> (driver->nodePool(), sym(2).StatementList);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 264: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).Statement);
+} break;
+
+case 265: {
+  sym(1).Node = makeAstNode<AST::StatementList> (driver->nodePool(), sym(1).StatementList, sym(2).Statement);
+} break;
+
+case 266: {
+  sym(1).Node = 0;
+} break;
+
+case 267: {
+  sym(1).Node = sym(1).StatementList->finish ();
+} break;
+
+case 269: {
+  AST::VariableStatement *node = makeAstNode<AST::VariableStatement> (driver->nodePool(),
+     sym(2).VariableDeclarationList->finish (/*readOnly=*/sym(1).ival == T_CONST));
+  node->declarationKindToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 270: {
+  sym(1).ival = T_CONST;
+} break;
+
+case 271: {
+  sym(1).ival = T_VAR;
+} break;
+
+case 272: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+
+case 273: {
+  AST::VariableDeclarationList *node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(),
+    sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+  node->commaToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 274: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclaration);
+} break;
+
+case 275: {
+  sym(1).Node = makeAstNode<AST::VariableDeclarationList> (driver->nodePool(), sym(1).VariableDeclarationList, sym(3).VariableDeclaration);
+} break;
+
+case 276: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 277: {
+  AST::VariableDeclaration *node = makeAstNode<AST::VariableDeclaration> (driver->nodePool(), sym(1).sval, sym(2).Expression);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 278: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+
+case 279: {
+  sym(1).Node = 0;
+} break;
+
+case 281: {
+  // ### TODO: AST for initializer
+  sym(1) = sym(2);
+} break;
+
+case 282: {
+  sym(1).Node = 0;
+} break;
+
+case 284: {
+  AST::EmptyStatement *node = makeAstNode<AST::EmptyStatement> (driver->nodePool());
+  node->semicolonToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 286: {
+  AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 287: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement, sym(7).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  node->elseToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 288: {
+  AST::IfStatement *node = makeAstNode<AST::IfStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->ifToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 290: {
+  AST::DoWhileStatement *node = makeAstNode<AST::DoWhileStatement> (driver->nodePool(), sym(2).Statement, sym(5).Expression);
+  node->doToken = loc(1);
+  node->whileToken = loc(3);
+  node->lparenToken = loc(4);
+  node->rparenToken = loc(6);
+  node->semicolonToken = loc(7);
+  sym(1).Node = node;
+} break;
+
+case 291: {
+  AST::WhileStatement *node = makeAstNode<AST::WhileStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->whileToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 292: {
+  AST::ForStatement *node = makeAstNode<AST::ForStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Expression, sym(9).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->firstSemicolonToken = loc(4);
+  node->secondSemicolonToken = loc(6);
+  node->rparenToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 293: {
+  AST::LocalForStatement *node = makeAstNode<AST::LocalForStatement> (driver->nodePool(),
+     sym(4).VariableDeclarationList->finish (/*readOnly=*/false), sym(6).Expression,
+     sym(8).Expression, sym(10).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->firstSemicolonToken = loc(5);
+  node->secondSemicolonToken = loc(7);
+  node->rparenToken = loc(9);
+  sym(1).Node = node;
+} break;
+
+case 294: {
+  AST:: ForEachStatement *node = makeAstNode<AST::ForEachStatement> (driver->nodePool(), sym(3).Expression,
+    sym(5).Expression, sym(7).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->inToken = loc(4);
+  node->rparenToken = loc(6);
+  sym(1).Node = node;
+} break;
+
+case 295: {
+  AST::LocalForEachStatement *node = makeAstNode<AST::LocalForEachStatement> (driver->nodePool(),
+    sym(4).VariableDeclaration, sym(6).Expression, sym(8).Statement);
+  node->forToken = loc(1);
+  node->lparenToken = loc(2);
+  node->varToken = loc(3);
+  node->inToken = loc(5);
+  node->rparenToken = loc(7);
+  sym(1).Node = node;
+} break;
+
+case 297: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool());
+  node->continueToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 299: {
+  AST::ContinueStatement *node = makeAstNode<AST::ContinueStatement> (driver->nodePool(), sym(2).sval);
+  node->continueToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 301: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool());
+  node->breakToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 303: {
+  AST::BreakStatement *node = makeAstNode<AST::BreakStatement> (driver->nodePool(), sym(2).sval);
+  node->breakToken = loc(1);
+  node->identifierToken = loc(2);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 305: {
+  AST::ReturnStatement *node = makeAstNode<AST::ReturnStatement> (driver->nodePool(), sym(2).Expression);
+  node->returnToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 306: {
+  AST::WithStatement *node = makeAstNode<AST::WithStatement> (driver->nodePool(), sym(3).Expression, sym(5).Statement);
+  node->withToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 307: {
+  AST::SwitchStatement *node = makeAstNode<AST::SwitchStatement> (driver->nodePool(), sym(3).Expression, sym(5).CaseBlock);
+  node->switchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 308: {
+  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 309: {
+  AST::CaseBlock *node = makeAstNode<AST::CaseBlock> (driver->nodePool(), sym(2).CaseClauses, sym(3).DefaultClause, sym(4).CaseClauses);
+  node->lbraceToken = loc(1);
+  node->rbraceToken = loc(5);
+  sym(1).Node = node;
+} break;
+
+case 310: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClause);
+} break;
+
+case 311: {
+  sym(1).Node = makeAstNode<AST::CaseClauses> (driver->nodePool(), sym(1).CaseClauses, sym(2).CaseClause);
+} break;
+
+case 312: {
+  sym(1).Node = 0;
+} break;
+
+case 313: {
+  sym(1).Node = sym(1).CaseClauses->finish ();
+} break;
+
+case 314: {
+  AST::CaseClause *node = makeAstNode<AST::CaseClause> (driver->nodePool(), sym(2).Expression, sym(4).StatementList);
+  node->caseToken = loc(1);
+  node->colonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 315: {
+  AST::DefaultClause *node = makeAstNode<AST::DefaultClause> (driver->nodePool(), sym(3).StatementList);
+  node->defaultToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+case 316:
+case 317: {
+  AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount()), sym(3).Statement);
+  node->identifierToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 318: {
+  AST::LabelledStatement *node = makeAstNode<AST::LabelledStatement> (driver->nodePool(), sym(1).sval, sym(3).Statement);
+  node->identifierToken = loc(1);
+  node->colonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 320: {
+  AST::ThrowStatement *node = makeAstNode<AST::ThrowStatement> (driver->nodePool(), sym(2).Expression);
+  node->throwToken = loc(1);
+  node->semicolonToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 321: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 322: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 323: {
+  AST::TryStatement *node = makeAstNode<AST::TryStatement> (driver->nodePool(), sym(2).Statement, sym(3).Catch, sym(4).Finally);
+  node->tryToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 324: {
+  AST::Catch *node = makeAstNode<AST::Catch> (driver->nodePool(), sym(3).sval, sym(5).Block);
+  node->catchToken = loc(1);
+  node->lparenToken = loc(2);
+  node->identifierToken = loc(3);
+  node->rparenToken = loc(4);
+  sym(1).Node = node;
+} break;
+
+case 325: {
+  AST::Finally *node = makeAstNode<AST::Finally> (driver->nodePool(), sym(2).Block);
+  node->finallyToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 327: {
+  AST::DebuggerStatement *node = makeAstNode<AST::DebuggerStatement> (driver->nodePool());
+  node->debuggerToken = loc(1);
+  node->semicolonToken = loc(2);
+  sym(1).Node = node;
+} break;
+
+case 328: {
+  AST::FunctionDeclaration *node = makeAstNode<AST::FunctionDeclaration> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
+  node->functionToken = loc(1);
+  node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 329: {
+  AST::FunctionExpression *node = makeAstNode<AST::FunctionExpression> (driver->nodePool(), sym(2).sval, sym(4).FormalParameterList, sym(7).FunctionBody);
+  node->functionToken = loc(1);
+  if (sym(2).sval)
+      node->identifierToken = loc(2);
+  node->lparenToken = loc(3);
+  node->rparenToken = loc(5);
+  node->lbraceToken = loc(6);
+  node->rbraceToken = loc(8);
+  sym(1).Node = node;
+} break;
+
+case 330: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).sval);
+  node->identifierToken = loc(1);
+  sym(1).Node = node;
+} break;
+
+case 331: {
+  AST::FormalParameterList *node = makeAstNode<AST::FormalParameterList> (driver->nodePool(), sym(1).FormalParameterList, sym(3).sval);
+  node->commaToken = loc(2);
+  node->identifierToken = loc(3);
+  sym(1).Node = node;
+} break;
+
+case 332: {
+  sym(1).Node = 0;
+} break;
+
+case 333: {
+  sym(1).Node = sym(1).FormalParameterList->finish ();
+} break;
+
+case 334: {
+  sym(1).Node = 0;
+} break;
+
+case 336: {
+  sym(1).Node = makeAstNode<AST::FunctionBody> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+
+case 337: {
+  sym(1).Node = makeAstNode<AST::Program> (driver->nodePool(), sym(1).SourceElements->finish ());
+} break;
+
+case 338: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElement);
+} break;
+
+case 339: {
+  sym(1).Node = makeAstNode<AST::SourceElements> (driver->nodePool(), sym(1).SourceElements, sym(2).SourceElement);
+} break;
+
+case 340: {
+  sym(1).Node = makeAstNode<AST::StatementSourceElement> (driver->nodePool(), sym(1).Statement);
+} break;
+
+case 341: {
+  sym(1).Node = makeAstNode<AST::FunctionSourceElement> (driver->nodePool(), sym(1).FunctionDeclaration);
+} break;
+
+case 342: {
+  sym(1).sval = 0;
+} break;
+
+case 344: {
+  sym(1).Node = 0;
+} break;
+
+            } // switch
+            action = nt_action(state_stack[tos], lhs[r] - TERMINAL_COUNT);
+        } // if
+    } while (action != 0);
+
+    if (first_token == last_token) {
+        const int errorState = state_stack[tos];
+
+        // automatic insertion of `;'
+        if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
+            SavedToken &tk = token_buffer[0];
+            tk.token = yytoken;
+            tk.dval = yylval;
+            tk.loc = yylloc;
+
+            yylloc = yyprevlloc;
+            yylloc.offset += yylloc.length;
+            yylloc.startColumn += yylloc.length;
+            yylloc.length = 0;
+
+            //const QString msg = qApp->translate("QDeclarativeParser", "Missing `;'");
+            //diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Warning, yylloc, msg));
+
+            first_token = &token_buffer[0];
+            last_token = &token_buffer[1];
+
+            yytoken = T_SEMICOLON;
+            yylval = 0;
+
+            action = errorState;
+
+            goto _Lcheck_token;
+        }
+
+        hadErrors = true;
+
+        token_buffer[0].token = yytoken;
+        token_buffer[0].dval = yylval;
+        token_buffer[0].loc = yylloc;
+
+        token_buffer[1].token = yytoken = lexer->lex();
+        token_buffer[1].dval  = yylval  = lexer->dval();
+        token_buffer[1].loc   = yylloc  = location(lexer);
+
+        if (t_action(errorState, yytoken)) {
+            QString msg;
+            int token = token_buffer[0].token;
+            if (token < 0 || token >= TERMINAL_COUNT)
+                msg = qApp->translate("QDeclarativeParser", "Syntax error");
+            else
+                msg = qApp->translate("QDeclarativeParser", "Unexpected token `%1'").arg(QLatin1String(spell[token]));
+            diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+            action = errorState;
+            goto _Lcheck_token;
+        }
+
+        static int tokens[] = {
+            T_PLUS,
+            T_EQ,
+
+            T_COMMA,
+            T_COLON,
+            T_SEMICOLON,
+
+            T_RPAREN, T_RBRACKET, T_RBRACE,
+
+            T_NUMERIC_LITERAL,
+            T_IDENTIFIER,
+
+            T_LPAREN, T_LBRACKET, T_LBRACE,
+
+            EOF_SYMBOL
+        };
+
+        for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) {
+            int a = t_action(errorState, *tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[*tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = *tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                first_token = &token_buffer[0];
+                last_token = &token_buffer[2];
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        for (int tk = 1; tk < TERMINAL_COUNT; ++tk) {
+            if (tk == T_AUTOMATIC_SEMICOLON || tk == T_FEED_UI_PROGRAM    ||
+                tk == T_FEED_JS_STATEMENT   || tk == T_FEED_JS_EXPRESSION ||
+                tk == T_FEED_JS_SOURCE_ELEMENT)
+               continue;
+
+            int a = t_action(errorState, tk);
+            if (a > 0 && t_action(a, yytoken)) {
+                const QString msg = qApp->translate("QDeclarativeParser", "Expected token `%1'").arg(QLatin1String(spell[tk]));
+                diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+
+                yytoken = tk;
+                yylval = 0;
+                yylloc = token_buffer[0].loc;
+                yylloc.length = 0;
+
+                action = errorState;
+                goto _Lcheck_token;
+            }
+        }
+
+        const QString msg = qApp->translate("QDeclarativeParser", "Syntax error");
+        diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc, msg));
+    }
+
+    return false;
+}
+
+QT_QML_END_NAMESPACE
+
+
diff --git a/tools/qdoc3/declarativeparser/qdeclarativejsparser_p.h b/tools/qdoc3/declarativeparser/qdeclarativejsparser_p.h
new file mode 100644
index 0000000..5eec1a4
--- /dev/null
+++ b/tools/qdoc3/declarativeparser/qdeclarativejsparser_p.h
@@ -0,0 +1,246 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+//
+// This file is automatically generated from qmljs.g.
+// Changes will be lost.
+//
+
+#ifndef QDECLARATIVEJSPARSER_P_H
+#define QDECLARATIVEJSPARSER_P_H
+
+#include "qdeclarativejsglobal_p.h"
+#include "qdeclarativejsgrammar_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsengine_p.h"
+
+#include <QtCore/QList>
+#include <QtCore/QString>
+
+QT_QML_BEGIN_NAMESPACE
+
+namespace QDeclarativeJS {
+
+class Engine;
+class NameId;
+
+class QML_PARSER_EXPORT Parser: protected QDeclarativeJSGrammar
+{
+public:
+    union Value {
+      int ival;
+      double dval;
+      NameId *sval;
+      AST::ArgumentList *ArgumentList;
+      AST::CaseBlock *CaseBlock;
+      AST::CaseClause *CaseClause;
+      AST::CaseClauses *CaseClauses;
+      AST::Catch *Catch;
+      AST::DefaultClause *DefaultClause;
+      AST::ElementList *ElementList;
+      AST::Elision *Elision;
+      AST::ExpressionNode *Expression;
+      AST::Finally *Finally;
+      AST::FormalParameterList *FormalParameterList;
+      AST::FunctionBody *FunctionBody;
+      AST::FunctionDeclaration *FunctionDeclaration;
+      AST::Node *Node;
+      AST::PropertyName *PropertyName;
+      AST::PropertyNameAndValueList *PropertyNameAndValueList;
+      AST::SourceElement *SourceElement;
+      AST::SourceElements *SourceElements;
+      AST::Statement *Statement;
+      AST::StatementList *StatementList;
+      AST::Block *Block;
+      AST::VariableDeclaration *VariableDeclaration;
+      AST::VariableDeclarationList *VariableDeclarationList;
+
+      AST::UiProgram *UiProgram;
+      AST::UiImportList *UiImportList;
+      AST::UiImport *UiImport;
+      AST::UiParameterList *UiParameterList;
+      AST::UiPublicMember *UiPublicMember;
+      AST::UiObjectDefinition *UiObjectDefinition;
+      AST::UiObjectInitializer *UiObjectInitializer;
+      AST::UiObjectBinding *UiObjectBinding;
+      AST::UiScriptBinding *UiScriptBinding;
+      AST::UiArrayBinding *UiArrayBinding;
+      AST::UiObjectMember *UiObjectMember;
+      AST::UiObjectMemberList *UiObjectMemberList;
+      AST::UiArrayMemberList *UiArrayMemberList;
+      AST::UiQualifiedId *UiQualifiedId;
+      AST::UiSignature *UiSignature;
+      AST::UiFormalList *UiFormalList;
+      AST::UiFormal *UiFormal;
+    };
+
+public:
+    Parser(Engine *engine);
+    ~Parser();
+
+    // parse a UI program
+    bool parse() { return parse(T_FEED_UI_PROGRAM); }
+    bool parseStatement() { return parse(T_FEED_JS_STATEMENT); }
+    bool parseExpression() { return parse(T_FEED_JS_EXPRESSION); }
+    bool parseSourceElement() { return parse(T_FEED_JS_SOURCE_ELEMENT); }
+    bool parseUiObjectMember() { return parse(T_FEED_UI_OBJECT_MEMBER); }
+    bool parseProgram() { return parse(T_FEED_JS_PROGRAM); }
+
+    AST::UiProgram *ast() const
+    { return AST::cast<AST::UiProgram *>(program); }
+
+    AST::Statement *statement() const
+    {
+        if (! program)
+            return 0;
+
+        return program->statementCast();
+    }
+
+    AST::ExpressionNode *expression() const
+    {
+        if (! program)
+            return 0;
+
+        return program->expressionCast();
+    }
+
+    AST::UiObjectMember *uiObjectMember() const
+    {
+        if (! program)
+            return 0;
+
+        return program->uiObjectMemberCast();
+    }
+
+    AST::Node *rootNode() const
+    { return program; }
+
+    QList<DiagnosticMessage> diagnosticMessages() const
+    { return diagnostic_messages; }
+
+    inline DiagnosticMessage diagnosticMessage() const
+    {
+        foreach (const DiagnosticMessage &d, diagnostic_messages) {
+            if (! d.kind == DiagnosticMessage::Warning)
+                return d;
+        }
+
+        return DiagnosticMessage();
+    }
+
+    inline QString errorMessage() const
+    { return diagnosticMessage().message; }
+
+    inline int errorLineNumber() const
+    { return diagnosticMessage().loc.startLine; }
+
+    inline int errorColumnNumber() const
+    { return diagnosticMessage().loc.startColumn; }
+
+protected:
+    bool parse(int startToken);
+
+    void reallocateStack();
+
+    inline Value &sym(int index)
+    { return sym_stack [tos + index - 1]; }
+
+    inline AST::SourceLocation &loc(int index)
+    { return location_stack [tos + index - 1]; }
+
+    AST::UiQualifiedId *reparseAsQualifiedId(AST::ExpressionNode *expr);
+
+protected:
+    Engine *driver;
+    int tos;
+    int stack_size;
+    Value *sym_stack;
+    int *state_stack;
+    AST::SourceLocation *location_stack;
+
+    AST::Node *program;
+
+    // error recovery
+    enum { TOKEN_BUFFER_SIZE = 3 };
+
+    struct SavedToken {
+       int token;
+       double dval;
+       AST::SourceLocation loc;
+    };
+
+    double yylval;
+    AST::SourceLocation yylloc;
+    AST::SourceLocation yyprevlloc;
+
+    SavedToken token_buffer[TOKEN_BUFFER_SIZE];
+    SavedToken *first_token;
+    SavedToken *last_token;
+
+    QList<DiagnosticMessage> diagnostic_messages;
+};
+
+} // end of namespace QDeclarativeJS
+
+
+
+#define J_SCRIPT_REGEXPLITERAL_RULE1 78
+
+#define J_SCRIPT_REGEXPLITERAL_RULE2 79
+
+QT_QML_END_NAMESPACE
+
+
+
+#endif // QDECLARATIVEJSPARSER_P_H
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index e180c0a..1bc4992 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -61,230 +61,6 @@ QT_BEGIN_NAMESPACE
 
 #define COMMAND_VERSION                         Doc::alias("version")
 int DitaXmlGenerator::id = 0;
-bool DitaXmlGenerator::inApiDesc = false;
-bool DitaXmlGenerator::inSection = false;
-bool DitaXmlGenerator::inDetailedDescription = false;
-bool DitaXmlGenerator::inLegaleseText = false;
-
-#define cxxapi_d_xref                      	Doc::alias("cxxapi-d-xref")
-#define cxxclass                           	Doc::alias("cxxclass")
-#define cxxdefine                          	Doc::alias("cxxdefine")
-#define cxxenumeration                     	Doc::alias("cxxenumeration")
-#define cxxfile                            	Doc::alias("cxxfile")
-#define cxxfunction                        	Doc::alias("cxxfunction")
-#define cxxstruct                          	Doc::alias("cxxstruct")
-#define cxxtypedef                         	Doc::alias("cxxtypedef")
-#define cxxunion                           	Doc::alias("cxxunion")
-#define cxxvariable                        	Doc::alias("cxxvariable")
-
-#define CXXAPIMAP                          	Doc::alias("cxxAPIMap")
-#define CXXCLASSREF                        	Doc::alias("cxxClassRef")
-#define CXXDEFINEREF                       	Doc::alias("cxxDefineRef")
-#define CXXENUMERATIONREF                  	Doc::alias("cxxEnumerationRef")
-#define CXXFILEREF                         	Doc::alias("cxxFileRef")
-#define CXXFUNCTIONREF                     	Doc::alias("cxxFunctionRef")
-#define CXXSTRUCTREF                       	Doc::alias("cxxStructRef")
-#define CXXTYPDEFREF                       	Doc::alias("cxxTypedefRef")
-#define CXXUNIONREF                        	Doc::alias("cxxUnionRef")
-#define CXXVARIABLEREF                     	Doc::alias("cxxVariableRef")
-
-#define CXXCLASS                           	Doc::alias("cxxClass")
-#define CXXCLASSABSTRACT                   	Doc::alias("cxxClassAbstract")
-#define CXXCLASSACCESSSPECIFIER            	Doc::alias("cxxClassAccessSpecifier")
-#define CXXCLASSAPIITEMLOCATION            	Doc::alias("cxxClassAPIItemLocation")
-#define CXXCLASSBASECLASS                  	Doc::alias("cxxClassBaseClass")
-#define CXXCLASSBASECLASSSTRUCT            	Doc::alias("cxxClassBaseStruct")
-#define CXXCLASSBASEUNION                  	Doc::alias("cxxClassBaseUnion")
-#define CXXCLASSDECLARATIONFILE            	Doc::alias("cxxClassDeclarationFile")
-#define CXXCLASSDECLARATIONFILELINE        	Doc::alias("cxxClassDeclarationFileLine")
-#define CXXCLASSDEFINITION                 	Doc::alias("cxxClassDefinition")
-#define CXXCLASSDEFINITIONFILE             	Doc::alias("cxxClassDefinitionFile")
-#define CXXCLASSDEFINITIONFILEEND          	Doc::alias("cxxClassDefinitionFileLineEnd")
-#define CXXCLASSDEFINITIONFILESTART        	Doc::alias("cxxClassDefinitionFileLineStart")
-#define CXXCLASSDERIVATION                 	Doc::alias("cxxClassDerivation")
-#define CXXCLASSDERIVATIONACCESSSPECIFIER  	Doc::alias("cxxClassDerivationAccessSpecifier")
-#define CXXCLASSDERIVATIONS                	Doc::alias("cxxClassDerivations")
-#define CXXCLASSDERIVATIONVIRTUAL          	Doc::alias("cxxClassDerivationVirtual")
-#define CXXCLASSDETAIL                     	Doc::alias("cxxClassDetail")
-#define CXXCLASSENUMERATIONINHERITED       	Doc::alias("cxxClassEnumerationInherited")
-#define CXXCLASSENUMERATORINHERITED        	Doc::alias("cxxClassEnumeratorInherited")
-#define CXXCLASSFUNCTIONINHERITED          	Doc::alias("cxxClassFunctionInherited")
-#define CXXCLASSINHERITS                   	Doc::alias("cxxClassInherits")
-#define CXXCLASSINHERITSDETAIL             	Doc::alias("cxxClassInheritsDetail")
-#define CXXCLASSNESTED                     	Doc::alias("cxxClassNested")
-#define CXXCLASSNESTEDCLASS                	Doc::alias("cxxClassNestedClass")
-#define CXXCLASSNESTEDDETAIL               	Doc::alias("cxxClassNestedDetail")
-#define CXXCLASSNESTEDSTRUCT               	Doc::alias("cxxClassNestedStruct")
-#define CXXCLASSNESTEDUNION                	Doc::alias("cxxClassNestedUnion")
-#define CXXCLASSTEMPLATEPARAMETER          	Doc::alias("cxxClassTemplateParameter")
-#define CXXCLASSTEMPLATEPARAMETERS         	Doc::alias("cxxClassTemplateParameters")
-#define CXXCLASSTEMPLATEPARAMETERTYPE      	Doc::alias("cxxClassTemplateParameterType")
-#define CXXCLASSVARIABLEINHERITED          	Doc::alias("cxxClassVariableInherited")
-
-#define CXXDEFINE                          	Doc::alias("cxxDefine")
-#define CXXDEFINEACCESSSPECIFIER           	Doc::alias("cxxDefineAccessSpecifier")
-#define CXXDEFINEAPIITEMLOCATION           	Doc::alias("cxxDefineAPIItemLocation")
-#define CXXDEFINEDECLARATIONFILE           	Doc::alias("cxxDefineDeclarationFile")
-#define CXXDEFINEDECLARATIONFILELINE       	Doc::alias("cxxDefineDeclarationFileLine")
-#define CXXDEFINEDEFINITION                	Doc::alias("cxxDefineDefinition")
-#define CXXDEFINEDETAIL                    	Doc::alias("cxxDefineDetail")
-#define CXXDEFINENAMELOOKUP                	Doc::alias("cxxDefineNameLookup")
-#define CXXDEFINEPARAMETER                 	Doc::alias("cxxDefineParameter")
-#define CXXDEFINEPARAMETERDECLARATIONNAME  	Doc::alias("cxxDefineParameterDeclarationName")
-#define CXXDEFINEPARAMETERS                	Doc::alias("cxxDefineParameters")
-#define CXXDEFINEPROTOTYPE                 	Doc::alias("cxxDefinePrototype")
-#define CXXDEFINEREIMPLEMENTED             	Doc::alias("cxxDefineReimplemented")
-
-#define CXXENUMERATION                     	Doc::alias("cxxEnumeration")
-#define CXXENUMERATIONACCESSSPECIFIER      	Doc::alias("cxxEnumerationAccessSpecifier")
-#define CXXENUMERATIONAPIITEMLOCATION      	Doc::alias("cxxEnumerationAPIItemLocation")
-#define CXXENUMERATIONDECLARATIONFILE      	Doc::alias("cxxEnumerationDeclarationFile")
-#define CXXENUMERATIONDECLARATIONFILELINE  	Doc::alias("cxxEnumerationDeclarationFileLine")
-#define CXXENUMERATIONDEFINITION                Doc::alias("cxxEnumerationDefinition")
-#define CXXENUMERATIONDEFINITIONFILE            Doc::alias("cxxEnumerationDefinitionFile")
-#define CXXENUMERATIONDEFINITIONFILELINEEND     Doc::alias("cxxEnumerationDefinitionFileLineEnd")
-#define CXXENUMERATIONDEFINITIONFILELINESTART   Doc::alias("cxxEnumerationDefinitionFileLineStart")
-#define CXXENUMERATIONDETAIL                    Doc::alias("cxxEnumerationDetail")
-#define CXXENUMERATIONNAMELOOKUP                Doc::alias("cxxEnumerationNameLookup")
-#define CXXENUMERATIONPROTOTYPE                 Doc::alias("cxxEnumerationPrototype")
-#define CXXENUMERATIONREIMPLEMENTED             Doc::alias("cxxEnumerationReimplemented")
-#define CXXENUMERATIONSCOPEDNAME                Doc::alias("cxxEnumerationScopedName")
-#define CXXENUMERATOR                           Doc::alias("cxxEnumerator")
-#define CXXENUMERATORAPIITEMLOCATION            Doc::alias("cxxEnumeratorAPIItemLocation")
-#define CXXENUMERATORDECLARATIONFILE            Doc::alias("cxxEnumeratorDeclarationFile")
-#define CXXENUMERATORDECLARATIONFILELINE        Doc::alias("cxxEnumeratorDeclarationFileLine")
-#define CXXENUMERATORINITIALISER                Doc::alias("cxxEnumeratorInitialiser")
-#define CXXENUMERATORNAMELOOKUP                 Doc::alias("cxxEnumeratorNameLookup")
-#define CXXENUMERATORPROTOTYPE                  Doc::alias("cxxEnumeratorPrototype")
-#define CXXENUMERATORS                          Doc::alias("cxxEnumerators")
-#define CXXENUMERATORSCOPEDNAME                 Doc::alias("cxxEnumeratorScopedName")
-
-#define CXXFILE_INFO_TYPES                      Doc::alias("cxxFile-info-types")
-#define CXXFILE_TYPES_DEFAULT                   Doc::alias("cxxFile-types-default")
-#define CXXFILE                                 Doc::alias("cxxFile")
-#define CXXFILEAPIITMELOCATION                  Doc::alias("cxxFileAPIItemLocation")
-#define CXXFILEDECLARATIONFILE                  Doc::alias("cxxFileDeclarationFile")
-
-#define CXXFUNCTION                             Doc::alias("cxxFunction")
-#define CXXFUNCTIONACCESSSPECIFIER              Doc::alias("cxxFunctionAccessSpecifier")
-#define CXXFUNCTIONAPIITEMLOCATION              Doc::alias("cxxFunctionAPIItemLocation")
-#define CXXFUNCTIONCONST                        Doc::alias("cxxFunctionConst")
-#define CXXFUNCTIONCONSTRUCTOR                  Doc::alias("cxxFunctionConstructor")
-#define CXXFUNCTIONDECLARATIONFILE              Doc::alias("cxxFunctionDeclarationFile")
-#define CXXFUNCTIONDECLARATIONFILELINE          Doc::alias("cxxFunctionDeclarationFileLine")
-#define CXXFUNCTIONDECLAREDTYPE                 Doc::alias("cxxFunctionDeclaredType")
-#define CXXFUNCTIONDEFINITION                   Doc::alias("cxxFunctionDefinition")
-#define CXXFUNCTIONDEFINITIONFILE               Doc::alias("cxxFunctionDefinitionFile")
-#define CXXFUNCTIONDEFINITIONFILELINEEND        Doc::alias("cxxFunctionDefinitionFileLineEnd")
-#define CXXFUNCTIONDEFINITIONFILELINESTART      Doc::alias("cxxFunctionDefinitionFileLineStart")
-#define CXXFUNCTIONDESTRUCTOR                   Doc::alias("cxxFunctionDestructor")
-#define CXXFUNCTIONDETAIL                       Doc::alias("cxxFunctionDetail")
-#define CXXFUNCTIONEXPLICIT                     Doc::alias("cxxFunctionExplicit")
-#define CXXFUNCTIONINLINE                       Doc::alias("cxxFunctionInline")
-#define CXXFUNCTIONNAMELOOKUP                   Doc::alias("cxxFunctionNameLookup")
-#define CXXFUNCTIONPARAMETER                    Doc::alias("cxxFunctionParameter")
-#define CXXFUNCTIONPARAMETERDECLARATIONNAME     Doc::alias("cxxFunctionParameterDeclarationName")
-#define CXXFUNCTIONPARAMETERDECLAREDTYPE        Doc::alias("cxxFunctionParameterDeclaredType")
-#define CXXFUNCTIONPARAMETERDEFAULTVALUE        Doc::alias("cxxFunctionParameterDefaultValue")
-#define CXXFUNCTIONPARAMETERDEFINITIONNAME      Doc::alias("cxxFunctionParameterDefinitionName")
-#define CXXFUNCTIONPARAMETERS                   Doc::alias("cxxFunctionParameters")
-#define CXXFUNCTIONPROTOTYPE                    Doc::alias("cxxFunctionPrototype")
-#define CXXFUNCTIONPUREVIRTUAL                  Doc::alias("cxxFunctionPureVirtual")
-#define CXXFUNCTIONREIMPLEMENTED                Doc::alias("cxxFunctionReimplemented")
-#define CXXFUNCTIONRETURNTYPE                   Doc::alias("cxxFunctionReturnType")
-#define CXXFUNCTIONSCOPEDNAME                   Doc::alias("cxxFunctionScopedName")
-#define CXXFUNCTIONSTORAGECLASSSPECIFIEREXTERN  Doc::alias("cxxFunctionStorageClassSpecifierExtern")
-#define CXXFUNCTIONSTORAGECLASSSPECIFIERMUTABLE Doc::alias("cxxFunctionStorageClassSpecifierMutable")
-#define CXXFUNCTIONSTORAGECLASSSPECIFIERSTATIC  Doc::alias("cxxFunctionStorageClassSpecifierStatic")
-#define CXXFUNCTIONTEMPLATEPARAMETER            Doc::alias("cxxFunctionTemplateParameter")
-#define CXXFUNCTIONTEMPLATEPARAMETERS           Doc::alias("cxxFunctionTemplateParameters")
-#define CXXFUNCTIONTEMPLATEPARAMETERTYPE        Doc::alias("cxxFunctionTemplateParameterType")
-#define CXXFUNCTIONVIRTUAL                      Doc::alias("cxxFunctionVirtual")
-#define CXXFUNCTIONVOLATILE                     Doc::alias("cxxFunctionVolatile")
-
-#define CXXSTRUCT                               Doc::alias("cxxStruct")
-#define CXXSTRUCTABSTRACT                       Doc::alias("cxxStructAbstract")
-#define CXXSTRUCTACCESSSPECIFIER                Doc::alias("cxxStructAccessSpecifier")
-#define CXXSTRUCTAPIITEMLOCATION                Doc::alias("cxxStructAPIItemLocation")
-#define CXXSTRUCTBASECLASS                      Doc::alias("cxxStructBaseClass")
-#define CXXSTRUCTBASESTRUCT                     Doc::alias("cxxStructBaseStruct")
-#define CXXSTRUCTBASEUNION                      Doc::alias("cxxStructBaseUnion")
-#define CXXSTRUCTDECLARATIONFILE                Doc::alias("cxxStructDeclarationFile")
-#define CXXSTRUCTDECLARATIONFILELINE            Doc::alias("cxxStructDeclarationFileLine")
-#define CXXSTRUCTDEFINITION                     Doc::alias("cxxStructDefinition")
-#define CXXSTRUCTDEFINITIONFILE                 Doc::alias("cxxStructDefinitionFile")
-#define CXXSTRUCTDEFINITIONFILELINEEND          Doc::alias("cxxStructDefinitionFileLineEnd")
-#define CXXSTRUCTDEFINITIONFILELINESTART        Doc::alias("cxxStructDefinitionFileLineStart")
-#define CXXSTRUCTDERIVATION                     Doc::alias("cxxStructDerivation")
-#define CXXSTRUCTDERIVATIONACCESSSPECIFIER      Doc::alias("cxxStructDerivationAccessSpecifier")
-#define CXXSTRUCTDERIVATIONS                    Doc::alias("cxxStructDerivations")
-#define CXXSTRUCTDERIVATIONVIRTUAL              Doc::alias("cxxStructDerivationVirtual")
-#define CXXSTRUCTDETAIL                         Doc::alias("cxxStructDetail")
-#define CXXSTRUCTENUMERATIONINHERITED           Doc::alias("cxxStructEnumerationInherited")
-#define CXXSTRUCTENUMERATORINHERITED            Doc::alias("cxxStructEnumeratorInherited")
-#define CXXSTRUCTFUNCTIONINHERITED              Doc::alias("cxxStructFunctionInherited")
-#define CXXSTRUCTINHERITS                       Doc::alias("cxxStructInherits")
-#define CXXSTRUCTINHERITSDETAIL                 Doc::alias("cxxStructInheritsDetail")
-#define CXXSTRUCTNESTED                         Doc::alias("cxxStructNested")
-#define CXXSTRUCTNESTEDCLASS                    Doc::alias("cxxStructNestedClass")
-#define CXXSTRUCTNESTEDDETAIL                   Doc::alias("cxxStructNestedDetail")
-#define CXXSTRUCTNESTEDSTRUCT                   Doc::alias("cxxStructNestedStruct")
-#define CXXSTRUCTNESTEDUNION                    Doc::alias("cxxStructNestedUnion")
-#define CXXSTRUCTTEMPLATEPARAMETER              Doc::alias("cxxStructTemplateParameter")
-#define CXXSTRUCTTEMPLATEPARAMETERS             Doc::alias("cxxStructTemplateParameters")
-#define CXXSTRUCTTEMPLATEPARAMETERTYPE          Doc::alias("cxxStructTemplateParameterType")
-#define CXXSTRUCTVARIABLEINHERITED              Doc::alias("cxxStructVariableInherited")
-
-#define CXXTYPEDEF                              Doc::alias("cxxTypedef")
-#define CXXTYPEDEFACCESSSPECIFIER               Doc::alias("cxxTypedefAccessSpecifier")
-#define CXXTYPEDEFAPIITEMLOCATION               Doc::alias("cxxTypedefAPIItemLocation")
-#define CXXTYPEDEFDECLARATIONFILE               Doc::alias("cxxTypedefDeclarationFile")
-#define CXXTYPEDEFDECLARATIONFILELINE           Doc::alias("cxxTypedefDeclarationFileLine")
-#define CXXTYPEDEFDECLAREDTYPE                  Doc::alias("cxxTypedefDeclaredType")
-#define CXXTYPEDEFDEFINITION                    Doc::alias("cxxTypedefDefinition")
-#define CXXTYPEDEFDETAIL                        Doc::alias("cxxTypedefDetail")
-#define CXXTYPEDEFNAMELOOKUP                    Doc::alias("cxxTypedefNameLookup")
-#define CXXTYPEDEFPROTOTYPE                     Doc::alias("cxxTypedefPrototype")
-#define CXXTYPEDEFREIMPLEMENTED                 Doc::alias("cxxTypedefReimplemented")
-#define CXXTYPEDEFSCOPEDNAME                    Doc::alias("cxxTypedefScopedName")
-
-#define CXXUNION                                Doc::alias("cxxUnion")
-#define CXXUNIONABSTRACT                        Doc::alias("cxxUnionAbstract")
-#define CXXUNIONACCESSSPECIFIER                 Doc::alias("cxxUnionAccessSpecifier")
-#define CXXUNIONAPIITEMLOCATION                 Doc::alias("cxxUnionAPIItemLocation")
-#define CXXUNIONDECLARATIONFILE                 Doc::alias("cxxUnionDeclarationFile")
-#define CXXUNIONDECLARATIONFILELINE             Doc::alias("cxxUnionDeclarationFileLine")
-#define CXXUNIONDEFINITION                      Doc::alias("cxxUnionDefinition")
-#define CXXUNIONDEFINITIONFILE                  Doc::alias("cxxUnionDefinitionFile")
-#define CXXUNIONDEFINITIONFILELINEEND           Doc::alias("cxxUnionDefinitionFileLineEnd")
-#define CXXUNIONDEFINITIONFILELINESTART         Doc::alias("cxxUnionDefinitionFileLineStart")
-#define CXXUNIONDETAIL                          Doc::alias("cxxUnionDetail")
-#define CXXUNIONNESTED                          Doc::alias("cxxUnionNested")
-#define CXXUNIONNESTEDCLASS                     Doc::alias("cxxUnionNestedClass")
-#define CXXUNIONNESTEDDETAIL                    Doc::alias("cxxUnionNestedDetail")
-#define CXXUNIONNESTEDSTRUCT                    Doc::alias("cxxUnionNestedStruct")
-#define CXXUNIONNESTEDUNION                     Doc::alias("cxxUnionNestedUnion")
-#define CXXUNIONTEMPLATEPARAMETER               Doc::alias("cxxUnionTemplateParameter")
-#define CXXUNIONTEMPLATEPARAMETERS              Doc::alias("cxxUnionTemplateParameters")
-#define CXXUNIONTEMPLATEPARAMETERTYPE           Doc::alias("cxxUnionTemplateParameterType")
-
-#define CXXVARIABLE                             Doc::alias("cxxVariable")
-#define CXXVARIABLEACCESSSPECIFIER              Doc::alias("cxxVariableAccessSpecifier")
-#define CXXVARIABLEAPIITEMLOCATION              Doc::alias("cxxVariableAPIItemLocation")
-#define CXXVARIABLECONST                        Doc::alias("cxxVariableConst")
-#define CXXVARIABLEDECLARATIONFILE              Doc::alias("cxxVariableDeclarationFile")
-#define CXXVARIABLEDECLARATIONFILELINE          Doc::alias("cxxVariableDeclarationFileLine")
-#define CXXVARIABLEDECLAREDTYPE                 Doc::alias("cxxVariableDeclaredType")
-#define CXXVARIABLEDEFINITION                   Doc::alias("cxxVariableDefinition")
-#define CXXVARIABLEDETAIL                       Doc::alias("cxxVariableDetail")
-#define CXXVARIABLENAMELOOKUP                   Doc::alias("cxxVariableNameLookup")
-#define CXXVARIABLEPROTOTYPE                    Doc::alias("cxxVariablePrototype")
-#define CXXVARIABLEREIMPLEMENTED                Doc::alias("cxxVariableReimplemented")
-#define CXXVARIABLESCOPEDNAME                   Doc::alias("cxxVariableScopedName")
-#define CXXVARIABLESTORAGECLASSSPECIFIEREXTERN  Doc::alias("cxxVariableStorageClassSpecifierExtern")
-#define CXXVARIABLESTORAGECLASSSPECIFIERMUTABLE Doc::alias("cxxVariableStorageClassSpecifierMutable")
-#define CXXVARIABLESTORAGECLASSSPECIFIERSTATIC  Doc::alias("cxxVariableStorageClassSpecifierStatic")
-#define CXXVARIABLEVOLATILE                     Doc::alias("cxxVariableVolatile")
 
 QString DitaXmlGenerator::sinceTitles[] =
     {
@@ -305,6 +81,187 @@ QString DitaXmlGenerator::sinceTitles[] =
         ""
     };
 
+/*
+  The strings in this array must appear in the same order as
+  the values in enum DitaXmlGenerator::DitaTag.
+ */
+QString DitaXmlGenerator::ditaTags[] =
+    {
+        "",
+        "alt",
+        "apiDesc",
+        "APIMap",
+        "apiName",
+        "audience",
+        "author",
+        "b",
+        "body",
+        "bodydiv",
+        "brand",
+        "category",
+        "codeblock",
+        "comment",
+        "component",
+        "copyrholder",
+        "copyright",
+        "copyryear",
+        "created",
+        "critdates",
+        "cxxAPIMap",
+        "cxxClass",
+        "cxxClassAbstract",
+        "cxxClassAccessSpecifier",
+        "cxxClassAPIItemLocation",
+        "cxxClassBaseClass",
+        "cxxClassDeclarationFile",
+        "cxxClassDeclarationFileLine",
+        "cxxClassDefinition",
+        "cxxClassDerivation",
+        "cxxClassDerivationAccessSpecifier",
+        "cxxClassDerivations",
+        "cxxClassDetail",
+        "cxxClassNested",
+        "cxxClassNestedClass",
+        "cxxClassNestedDetail",
+        "cxxDefine",
+        "cxxDefineAccessSpecifier",
+        "cxxDefineAPIItemLocation",
+        "cxxDefineDeclarationFile",
+        "cxxDefineDeclarationFileLine",
+        "cxxDefineDefinition",
+        "cxxDefineDetail",
+        "cxxDefineNameLookup",
+        "cxxDefineParameter",
+        "cxxDefineParameterDeclarationName",
+        "cxxDefineParameters",
+        "cxxDefinePrototype",
+        "cxxDefineReimplemented",
+        "cxxEnumeration",
+        "cxxEnumerationAccessSpecifier",
+        "cxxEnumerationAPIItemLocation",
+        "cxxEnumerationDeclarationFile",
+        "cxxEnumerationDeclarationFileLine",
+        "cxxEnumerationDefinition",
+        "cxxEnumerationDefinitionFile",
+        "cxxEnumerationDefinitionFileLineStart",
+        "cxxEnumerationDefinitionFileLineEnd",
+        "cxxEnumerationDetail",
+        "cxxEnumerationNameLookup",
+        "cxxEnumerationPrototype",
+        "cxxEnumerationScopedName",
+        "cxxEnumerator",
+        "cxxEnumeratorInitialiser",
+        "cxxEnumeratorNameLookup",
+        "cxxEnumeratorPrototype",
+        "cxxEnumerators",
+        "cxxEnumeratorScopedName",
+        "cxxFunction",
+        "cxxFunctionAccessSpecifier",
+        "cxxFunctionAPIItemLocation",
+        "cxxFunctionConst",
+        "cxxFunctionConstructor",
+        "cxxFunctionDeclarationFile",
+        "cxxFunctionDeclarationFileLine",
+        "cxxFunctionDeclaredType",
+        "cxxFunctionDefinition",
+        "cxxFunctionDestructor",
+        "cxxFunctionDetail",
+        "cxxFunctionNameLookup",
+        "cxxFunctionParameter",
+        "cxxFunctionParameterDeclarationName",
+        "cxxFunctionParameterDeclaredType",
+        "cxxFunctionParameterDefaultValue",
+        "cxxFunctionParameters",
+        "cxxFunctionPrototype",
+        "cxxFunctionPureVirtual",
+        "cxxFunctionReimplemented",
+        "cxxFunctionScopedName",
+        "cxxFunctionStorageClassSpecifierStatic",
+        "cxxFunctionVirtual",
+        "cxxTypedef",
+        "cxxTypedefAccessSpecifier",
+        "cxxTypedefAPIItemLocation",
+        "cxxTypedefDeclarationFile",
+        "cxxTypedefDeclarationFileLine",
+        "cxxTypedefDefinition",
+        "cxxTypedefDetail",
+        "cxxTypedefNameLookup",
+        "cxxTypedefScopedName",
+        "cxxVariable",
+        "cxxVariableAccessSpecifier",
+        "cxxVariableAPIItemLocation",
+        "cxxVariableDeclarationFile",
+        "cxxVariableDeclarationFileLine",
+        "cxxVariableDeclaredType",
+        "cxxVariableDefinition",
+        "cxxVariableDetail",
+        "cxxVariableNameLookup",
+        "cxxVariablePrototype",
+        "cxxVariableReimplemented",
+        "cxxVariableScopedName",
+        "cxxVariableStorageClassSpecifierStatic",
+        "data",
+        "data-about",
+        "dd",
+        "dl",
+        "dlentry",
+        "dt",
+        "entry",
+        "fig",
+        "i",
+        "image",
+        "keyword",
+        "keywords",
+        "li",
+        "link",
+        "linktext",
+        "lq",
+        "metadata",
+        "ol",
+        "othermeta",
+        "p",
+        "parameter",
+        "permissions",
+        "ph",
+        "platform",
+        "pre",
+        "prodinfo",
+        "prodname",
+        "prolog",
+        "publisher",
+        "related-links",
+        "resourceid",
+        "revised",
+        "row",
+        "section",
+        "sectiondiv",
+        "shortdesc",
+        "simpletable",
+        "source",
+        "stentry",
+        "sthead",
+        "strow",
+        "sub",
+        "sup",
+        "table",
+        "tbody",
+        "tgroup",
+        "thead",
+        "title",
+        "tm",
+        "topic",
+        "topicmeta",
+        "topicref",
+        "tt",
+        "u",
+        "ul",
+        "unknown",
+        "vrm",
+        "vrmlist",
+        "xref",
+        ""
+    };
+
 static bool showBrokenLinks = false;
 
 /*!
@@ -330,10 +287,11 @@ void DitaXmlGenerator::addLink(const QString& href,
                                const QStringRef& text)
 {
     if (!href.isEmpty()) {
-        xmlWriter().writeStartElement("xref");
+        writeStartTag(DT_xref);
+        // formathtml
         xmlWriter().writeAttribute("href", href);
         writeCharacters(text.toString());
-        xmlWriter().writeEndElement(); // </xref>
+        writeEndTag(); // </xref>
     }
     else {
         writeCharacters(text.toString());
@@ -341,22 +299,129 @@ void DitaXmlGenerator::addLink(const QString& href,
 }
 
 /*!
+  Push \a t onto the dita tag stack and write the appropriate
+  start tag to the DITA XML file.
+ */
+void DitaXmlGenerator::writeStartTag(DitaTag t)
+{
+    xmlWriter().writeStartElement(ditaTags[t]);
+    tagStack.push(t);
+}
+
+/*!
+  Pop the current DITA tag off the stack, and write the
+  appropriate end tag to the DITA XML file. 
+ */
+void DitaXmlGenerator::writeEndTag(DitaTag t)
+{
+    DitaTag top = tagStack.pop();
+    if (t > DT_NONE && top != t)
+        qDebug() << "Expected:" << t << "ACTUAL:" << top;
+    xmlWriter().writeEndElement();
+}
+
+/*!
+  Return the current DITA element tag, the one
+  on top of the stack.
+ */
+DitaXmlGenerator::DitaTag DitaXmlGenerator::currentTag()
+{
+    return tagStack.top();
+}
+
+/*!
+  Write the start tag \c{<apiDesc>}. if \a title is not
+  empty, generate a GUID from it and write the GUID as the
+  value of the \e{id} attribute. Then write \a title as
+  the value of the \e {spectitle} attribute.
+
+  Then if \a outputclass is not empty, write it as the value
+  of the \a outputclass attribute.
+
+  Fiunally, set the section nesting level to 1 and return 1.
+ */
+int DitaXmlGenerator::enterApiDesc(const QString& outputclass, const QString& title)
+{
+    writeStartTag(DT_apiDesc);
+    if (!title.isEmpty()) {
+        writeGuidAttribute(title);
+        xmlWriter().writeAttribute("spectitle",title);
+     }
+    if (!outputclass.isEmpty())
+        xmlWriter().writeAttribute("outputclass",outputclass);
+    sectionNestingLevel = 1;
+    return sectionNestingLevel;
+}
+
+/*!
+  If the section nesting level is 0, output a \c{<section>}
+  element with an \e id attribute generated from \a title and
+  an \e outputclass attribute set to \a outputclass.
+  If \a title is null, no \e id attribute is output.
+  If \a outputclass is empty, no \e outputclass attribute
+  is output.
+
+  Finally, increment the section nesting level and return
+  the new value.
+ */
+int DitaXmlGenerator::enterSection(const QString& outputclass, const QString& title)
+{
+    if (sectionNestingLevel == 0) {
+        writeStartTag(DT_section);
+        if (!title.isEmpty())
+            writeGuidAttribute(title);
+        if (!outputclass.isEmpty())
+            xmlWriter().writeAttribute("outputclass",outputclass);
+    }
+    else if (!title.isEmpty()) {
+        writeStartTag(DT_p);
+        writeGuidAttribute(title);
+        if (!outputclass.isEmpty())
+            xmlWriter().writeAttribute("outputclass",outputclass);
+        writeCharacters(title);
+        writeEndTag(); // </p>
+    }
+    return ++sectionNestingLevel;
+}
+
+/*!
+  If the section nesting level is greater than 0, decrement
+  it. If it becomes 0, output a \c {</section>}. Return the
+  decremented section nesting level.
+ */
+int DitaXmlGenerator::leaveSection()
+{
+    if (sectionNestingLevel > 0) {
+        --sectionNestingLevel;
+        if (sectionNestingLevel == 0)
+            writeEndTag(); // </section> or </apiDesc>
+    }
+    return sectionNestingLevel;
+}
+
+/*!
   The default constructor.
  */
 DitaXmlGenerator::DitaXmlGenerator()
-    : inLink(false),
-      inContents(false),
+    : inContents(false),
+      inDetailedDescription(false),
+      inLegaleseText(false),
+      inLink(false),
+      inObsoleteLink(false),
       inSectionHeading(false),
       inTableHeader(false),
       inTableBody(false),
-      numTableRows(0),
-      threeColumnEnumValueTable(true),
+      noLinks(false),
+      obsoleteLinks(false),
       offlineDocs(true),
+      threeColumnEnumValueTable(true),
+      codeIndent(0),
+      numTableRows(0),
+      divNestingLevel(0),
+      sectionNestingLevel(0),
+      tableColumnCount(0),
       funcLeftParen("\\S(\\()"),
-      myTree(0),
-      obsoleteLinks(false),
-      noLinks(false),
-      tableColumnCount(0)
+      myTree(0)
 {
     // nothing yet.
 }
@@ -378,29 +443,9 @@ DitaXmlGenerator::~DitaXmlGenerator()
  */
 void DitaXmlGenerator::initializeGenerator(const Config &config)
 {
-    static const struct {
-        const char *key;
-        const char *tag;
-    } defaults[] = {
-        { ATOM_FORMATTING_BOLD, "b" },
-        { ATOM_FORMATTING_INDEX, "<!--" },
-        { ATOM_FORMATTING_ITALIC, "i" },
-        { ATOM_FORMATTING_PARAMETER, "i" },
-        { ATOM_FORMATTING_SUBSCRIPT, "sub" },
-        { ATOM_FORMATTING_SUPERSCRIPT, "sup" },
-        { ATOM_FORMATTING_TELETYPE, "tt", },
-        { ATOM_FORMATTING_UNDERLINE, "u", },
-        { 0, 0 }
-    };
-
     Generator::initializeGenerator(config);
     obsoleteLinks = config.getBool(QLatin1String(CONFIG_OBSOLETELINKS));
     setImageFileExtensions(QStringList() << "png" << "jpg" << "jpeg" << "gif");
-    int i = 0;
-    while (defaults[i].key) {
-        formattingLeftMap().insert(defaults[i].key, defaults[i].tag);
-        i++;
-    }
 
     style = config.getString(DitaXmlGenerator::format() +
                              Config::dot +
@@ -437,6 +482,7 @@ void DitaXmlGenerator::initializeGenerator(const Config &config)
     if (naturalLanguage.isEmpty())
         naturalLanguage = QLatin1String("en");
 
+    config.subVarsAndValues("dita.metadata.default",metadataDefaults);
     QSet<QString> editionNames = config.subVars(CONFIG_EDITION);
     QSet<QString>::ConstIterator edition = editionNames.begin();
     while (edition != editionNames.end()) {
@@ -467,7 +513,8 @@ void DitaXmlGenerator::initializeGenerator(const Config &config)
                                               Config::dot +
                                               DITAXMLGENERATOR_CUSTOMHEADELEMENTS);
     codeIndent = config.getInt(CONFIG_CODEINDENT);
-
+    version = config.getString(CONFIG_VERSION);
+    vrm = version.split(".");
 }
 
 /*!
@@ -639,7 +686,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     int skipAhead = 0;
     QString hx, str;
     static bool in_para = false;
-    QString guid, hc;
+    QString guid, hc, attr;
 
     switch (atom->type()) {
     case Atom::AbstractLeft:
@@ -670,13 +717,13 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         //skipAhead = skipAtoms(atom, Atom::BriefRight);
         //break;
         //}
-        if (inApiDesc || inSection) {
-            xmlWriter().writeStartElement("p");
+        if (inSection()) {
+            writeStartTag(DT_p);
             xmlWriter().writeAttribute("outputclass","brief");
         }
         else {
             noLinks = true;
-            xmlWriter().writeStartElement("shortdesc");
+            writeStartTag(DT_shortdesc);
         }
         if (relative->type() == Node::Property ||
             relative->type() == Node::Variable) {
@@ -704,62 +751,98 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::BriefRight:
         //        if (relative->type() != Node::Fake) 
-        xmlWriter().writeEndElement(); // </shortdesc> or </p>
+        writeEndTag(); // </shortdesc> or </p>
         noLinks = false;
         break;
     case Atom::C:
-        xmlWriter().writeStartElement(formattingLeftMap()[ATOM_FORMATTING_TELETYPE]);
+        writeStartTag(DT_tt);
         if (inLink) {
             writeCharacters(protectEnc(plainCode(atom->string())));
         }
         else {
             writeText(atom->string(), marker, relative);
         }
-        xmlWriter().writeEndElement(); // sse writeStartElement() above
+        writeEndTag(); // see writeStartElement() above
         break;
     case Atom::Code:
         {
-            xmlWriter().writeStartElement("codeblock");
+            writeStartTag(DT_codeblock);
             QString chars = trimmedTrailing(atom->string()); 
             writeText(chars, marker, relative);
-            xmlWriter().writeEndElement(); // </codeblock>
+            writeEndTag(); // </codeblock>
         }
 	break;
     case Atom::Qml:
-        xmlWriter().writeStartElement("codeblock");
+        writeStartTag(DT_codeblock);
         writeText(trimmedTrailing(atom->string()), marker, relative);
-        xmlWriter().writeEndElement(); // </codeblock>
+        writeEndTag(); // </codeblock>
 	break;
     case Atom::CodeNew:
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         xmlWriter().writeCharacters("you can rewrite it as");
-        xmlWriter().writeEndElement(); // </p>
-        xmlWriter().writeStartElement("codeblock");
+        writeEndTag(); // </p>
+        writeStartTag(DT_codeblock);
         writeText(trimmedTrailing(atom->string()), marker, relative);
-        xmlWriter().writeEndElement(); // </codeblock>
+        writeEndTag(); // </codeblock>
         break;
     case Atom::CodeOld:
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         xmlWriter().writeCharacters("For example, if you have code like");
-        xmlWriter().writeEndElement(); // </p>
+        writeEndTag(); // </p>
         // fallthrough
     case Atom::CodeBad:
-        xmlWriter().writeStartElement("codeblock");
+        writeStartTag(DT_codeblock);
         writeCharacters(trimmedTrailing(plainCode(atom->string())));
-        xmlWriter().writeEndElement(); // </codeblock>
+        writeEndTag(); // </codeblock>
 	break;
-    case Atom::Div:
-        xmlWriter().writeStartElement("bodydiv");
-        if (!atom->string().isEmpty())
-            xmlWriter().writeAttribute("outputclass", atom->string());
+    case Atom::DivLeft:
+        {
+            attr = atom->string();
+            DitaTag t = currentTag();
+            if ((t == DT_section) || (t == DT_sectiondiv)) {
+                writeStartTag(DT_sectiondiv);
+                divNestingLevel++;
+            }
+            else if ((t == DT_body) || (t == DT_bodydiv)) {
+                writeStartTag(DT_bodydiv);
+                divNestingLevel++;
+            }
+            if (!attr.isEmpty()) {
+                if (attr.contains('=')) {
+                    int index = 0;
+                    int from = 0;
+                    QString values;
+                    while (index >= 0) {
+                        index = attr.indexOf('"',from);
+                        if (index >= 0) {
+                            ++index;
+                            from = index;
+                            index = attr.indexOf('"',from);
+                            if (index > from) {
+                                if (!values.isEmpty())
+                                    values.append(' ');
+                                values += attr.mid(from,index-from);
+                                from = index+1;
+                            }
+                        }
+                    }
+                    attr = values;
+                }
+            }
+            xmlWriter().writeAttribute("outputclass", attr);
+        }
         break;
-    case Atom::EndDiv:
-        xmlWriter().writeEndElement(); // </bodydiv>
+    case Atom::DivRight:
+        if ((currentTag() == DT_sectiondiv) || (currentTag() == DT_bodydiv)) {
+            writeEndTag(); // </sectiondiv>, </bodydiv>, or </p>
+            if (divNestingLevel > 0)
+                --divNestingLevel;
+        }
         break;
     case Atom::FootnoteLeft:
         // ### For now
         if (in_para) {
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             in_para = false;
         }
         xmlWriter().writeCharacters("<!-- ");
@@ -773,18 +856,68 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::FormatIf:
         break;
     case Atom::FormattingLeft:
-        xmlWriter().writeStartElement(formattingLeftMap()[atom->string()]);
-        if (atom->string() == ATOM_FORMATTING_PARAMETER) {
-            if (atom->next() != 0 && atom->next()->type() == Atom::String) {
-                QRegExp subscriptRegExp("([a-z]+)_([0-9n])");
-                if (subscriptRegExp.exactMatch(atom->next()->string())) {
-                    xmlWriter().writeCharacters(subscriptRegExp.cap(1));
-                    xmlWriter().writeStartElement("sub");
-                    xmlWriter().writeCharacters(subscriptRegExp.cap(2));
-                    xmlWriter().writeEndElement(); // </sub>
-                    skipAhead = 1;
+        {
+            DitaTag t = DT_LAST;
+            if (atom->string() == ATOM_FORMATTING_BOLD)
+                t = DT_b;
+            else if (atom->string() == ATOM_FORMATTING_PARAMETER)
+                t = DT_i;
+            else if (atom->string() == ATOM_FORMATTING_ITALIC)
+                t = DT_i;
+            else if (atom->string() == ATOM_FORMATTING_TELETYPE)
+                t = DT_tt;
+            else if (atom->string().startsWith("span ")) {
+                t = DT_keyword;
+            }
+            else if (atom->string() == ATOM_FORMATTING_UNDERLINE)
+                t = DT_u;
+            else if (atom->string() == ATOM_FORMATTING_INDEX)
+                t = DT_comment;
+            else if (atom->string() == ATOM_FORMATTING_SUBSCRIPT)
+                t = DT_sub;
+            else if (atom->string() == ATOM_FORMATTING_SUPERSCRIPT)
+                t = DT_sup;
+            else
+                qDebug() << "DT_LAST";
+            writeStartTag(t);
+            if (atom->string() == ATOM_FORMATTING_PARAMETER) {
+                if (atom->next() != 0 && atom->next()->type() == Atom::String) {
+                    QRegExp subscriptRegExp("([a-z]+)_([0-9n])");
+                    if (subscriptRegExp.exactMatch(atom->next()->string())) {
+                        xmlWriter().writeCharacters(subscriptRegExp.cap(1));
+                        writeStartTag(DT_sub);
+                        xmlWriter().writeCharacters(subscriptRegExp.cap(2));
+                        writeEndTag(); // </sub>
+                        skipAhead = 1;
+                    }
                 }
             }
+            else if (t == DT_keyword) {
+                QString attr = atom->string().mid(5);
+                if (!attr.isEmpty()) {
+                    if (attr.contains('=')) {
+                        int index = 0;
+                        int from = 0;
+                        QString values;
+                        while (index >= 0) {
+                            index = attr.indexOf('"',from);
+                            if (index >= 0) {
+                                ++index;
+                                from = index;
+                                index = attr.indexOf('"',from);
+                                if (index > from) {
+                                    if (!values.isEmpty())
+                                        values.append(' ');
+                                    values += attr.mid(from,index-from);
+                                    from = index+1;
+                                }
+                            }
+                        }
+                        attr = values;
+                    }
+                }
+                xmlWriter().writeAttribute("outputclass", attr);
+            }
         }
         break;
     case Atom::FormattingRight:
@@ -792,7 +925,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             endLink();
         }
         else {
-            xmlWriter().writeEndElement(); // ?
+            writeEndTag(); // ?
         }
         break;
     case Atom::AnnotatedList:
@@ -981,7 +1114,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 /*
                   First generate the table of contents.
                  */
-                xmlWriter().writeStartElement("ul");
+                writeStartTag(DT_ul);
                 s = sections.constBegin();
                 while (s != sections.constEnd()) {
                     if (!(*s).members.isEmpty()) {
@@ -990,17 +1123,17 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                     }
                     ++s;
                 }
-                xmlWriter().writeEndElement(); // </ul>
+                writeEndTag(); // </ul>
 
                 int idx = 0;
                 s = sections.constBegin();
                 while (s != sections.constEnd()) {
                     if (!(*s).members.isEmpty()) {
-                        xmlWriter().writeStartElement("p");
+                        writeStartTag(DT_p);
                         writeGuidAttribute(Doc::canonicalTitle((*s).name));
                         xmlWriter().writeAttribute("outputclass","h3");
                         writeCharacters(protectEnc((*s).name));
-                        xmlWriter().writeEndElement(); // </p>
+                        writeEndTag(); // </p>
                         if (idx == Class)
                             generateCompactList(0, marker, ncmap.value(), false, QString("Q"));
                         else if (idx == QmlClass)
@@ -1020,15 +1153,16 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                             pmap = parentmaps.begin();
                             while (pmap != parentmaps.end()) {
                                 NodeList nlist = pmap->values();
-                                xmlWriter().writeStartElement("p");
+                                writeStartTag(DT_p);
                                 xmlWriter().writeCharacters("Class ");
-                                xmlWriter().writeStartElement("xref");
+                                writeStartTag(DT_xref);
+                                // formathtml
                                 xmlWriter().writeAttribute("href",linkForNode(pmap.key(), 0));
                                 QStringList pieces = fullName(pmap.key(), 0, marker).split("::");
                                 writeCharacters(protectEnc(pieces.last()));
-                                xmlWriter().writeEndElement(); // </xref>
+                                writeEndTag(); // </xref>
                                 xmlWriter().writeCharacters(":");
-                                xmlWriter().writeEndElement(); // </p>
+                                writeEndTag(); // </p>
 
                                 generateSection(nlist, 0, marker, CodeMarker::Summary);
                                 ++pmap;
@@ -1060,8 +1194,9 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 fileName = QLatin1String("images/") + protectEnc(atom->string());
             }
 
-            xmlWriter().writeStartElement("fig");
-            xmlWriter().writeStartElement("image");
+            if (currentTag() != DT_xref)
+                writeStartTag(DT_fig);
+            writeStartTag(DT_image);
             xmlWriter().writeAttribute("href",protectEnc(fileName));
             if (atom->type() == Atom::InlineImage)
                 xmlWriter().writeAttribute("placement","inline");
@@ -1070,12 +1205,13 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 xmlWriter().writeAttribute("align","center");
             }
             if (!text.isEmpty()) {
-                xmlWriter().writeStartElement("alt");
+                writeStartTag(DT_alt);
                 writeCharacters(protectEnc(text));
-                xmlWriter().writeEndElement(); // </alt>
+                writeEndTag(); // </alt>
             }
-            xmlWriter().writeEndElement(); // </image>
-            xmlWriter().writeEndElement(); // </fig>
+            writeEndTag(); // </image>
+            if (currentTag() != DT_xref)
+                writeEndTag(); // </fig>
         }
         break;
     case Atom::ImageText:
@@ -1129,47 +1265,47 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::ListLeft:
         if (in_para) {
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             in_para = false;
         }
         if (atom->string() == ATOM_LIST_BULLET) {
-            xmlWriter().writeStartElement("ul");
+            writeStartTag(DT_ul);
         }
         else if (atom->string() == ATOM_LIST_TAG) {
-            xmlWriter().writeStartElement("dl");
+            writeStartTag(DT_dl);
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                xmlWriter().writeStartElement("simpletable");
+                writeStartTag(DT_simpletable);
                 xmlWriter().writeAttribute("outputclass","valuelist");
-                xmlWriter().writeStartElement("sthead");
-                xmlWriter().writeStartElement("stentry");
+                writeStartTag(DT_sthead);
+                writeStartTag(DT_stentry);
                 xmlWriter().writeCharacters("Constant");
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeStartElement("stentry");
+                writeEndTag(); // </stentry>
+                writeStartTag(DT_stentry);
                 xmlWriter().writeCharacters("Value");
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeStartElement("stentry");
+                writeEndTag(); // </stentry>
+                writeStartTag(DT_stentry);
                 xmlWriter().writeCharacters("Description");
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeEndElement(); // </sthead>
+                writeEndTag(); // </stentry>
+                writeEndTag(); // </sthead>
             }
             else {
-                xmlWriter().writeStartElement("simpletable");
+                writeStartTag(DT_simpletable);
                 xmlWriter().writeAttribute("outputclass","valuelist");
-                xmlWriter().writeStartElement("sthead");
-                xmlWriter().writeStartElement("stentry");
+                writeStartTag(DT_sthead);
+                writeStartTag(DT_stentry);
                 xmlWriter().writeCharacters("Constant");
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeStartElement("stentry");
+                writeEndTag(); // </stentry>
+                writeStartTag(DT_stentry);
                 xmlWriter().writeCharacters("Value");
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeEndElement(); // </sthead>
+                writeEndTag(); // </stentry>
+                writeEndTag(); // </sthead>
             }
         }
         else {
-            xmlWriter().writeStartElement("ol");
+            writeStartTag(DT_ol);
             if (atom->string() == ATOM_LIST_UPPERALPHA)
                 xmlWriter().writeAttribute("outputclass","upperalpha");
             else if (atom->string() == ATOM_LIST_LOWERALPHA)
@@ -1191,17 +1327,17 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::ListTagLeft:
         if (atom->string() == ATOM_LIST_TAG) {
-            xmlWriter().writeStartElement("dt");
+            writeStartTag(DT_dt);
         }
         else { // (atom->string() == ATOM_LIST_VALUE)
-            xmlWriter().writeStartElement("strow");
-            xmlWriter().writeStartElement("stentry");
-            xmlWriter().writeStartElement("tt");
+            writeStartTag(DT_strow);
+            writeStartTag(DT_stentry);
+            writeStartTag(DT_tt);
             writeCharacters(protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                            relative))));
-            xmlWriter().writeEndElement(); // </tt>
-            xmlWriter().writeEndElement(); // </stentry>
-            xmlWriter().writeStartElement("stentry");
+            writeEndTag(); // </tt>
+            writeEndTag(); // </stentry>
+            writeStartTag(DT_stentry);
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -1212,64 +1348,64 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             if (itemValue.isEmpty())
                 xmlWriter().writeCharacters("?");
             else {
-                xmlWriter().writeStartElement("tt");
+                writeStartTag(DT_tt);
                 writeCharacters(protectEnc(itemValue));
-                xmlWriter().writeEndElement(); // </tt>
+                writeEndTag(); // </tt>
             }
             skipAhead = 1;
         }
         break;
     case Atom::ListTagRight:
         if (atom->string() == ATOM_LIST_TAG)
-            xmlWriter().writeEndElement(); // </dt>
+            writeEndTag(); // </dt>
         break;
     case Atom::ListItemLeft:
         if (atom->string() == ATOM_LIST_TAG) {
-            xmlWriter().writeStartElement("dd");
+            writeStartTag(DT_dd);
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             if (threeColumnEnumValueTable) {
-                xmlWriter().writeEndElement(); // </stentry>
-                xmlWriter().writeStartElement("stentry");
+                writeEndTag(); // </stentry>
+                writeStartTag(DT_stentry);
             }
         }
         else {
-            xmlWriter().writeStartElement("li");
+            writeStartTag(DT_li);
         }
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
         break;
     case Atom::ListItemRight:
         if (atom->string() == ATOM_LIST_TAG) {
-            xmlWriter().writeEndElement(); // </dd>
+            writeEndTag(); // </dd>
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            xmlWriter().writeEndElement(); // </stentry>
-            xmlWriter().writeEndElement(); // </strow>
+            writeEndTag(); // </stentry>
+            writeEndTag(); // </strow>
         }
         else {
-            xmlWriter().writeEndElement(); // </li>
+            writeEndTag(); // </li>
         }
         break;
     case Atom::ListRight:
         if (atom->string() == ATOM_LIST_BULLET) {
-            xmlWriter().writeEndElement(); // </ul>
+            writeEndTag(); // </ul>
         }
         else if (atom->string() == ATOM_LIST_TAG) {
-            xmlWriter().writeEndElement(); // </dl>
+            writeEndTag(); // </dl>
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            xmlWriter().writeEndElement(); // </simpletable>
+            writeEndTag(); // </simpletable>
         }
         else {
-            xmlWriter().writeEndElement(); // </ol>
+            writeEndTag(); // </ol>
         }
         break;
     case Atom::Nop:
         // nothing
         break;
     case Atom::ParaLeft:
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         if (inLegaleseText)
             xmlWriter().writeAttribute("outputclass","legalese");
         in_para = true;
@@ -1277,15 +1413,15 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::ParaRight:
         endLink();
         if (in_para) {
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             in_para = false;
         }
         break;
     case Atom::QuotationLeft:
-        xmlWriter().writeStartElement("lq");
+        writeStartTag(DT_lq);
         break;
     case Atom::QuotationRight:
-        xmlWriter().writeEndElement(); // </lq>
+        writeEndTag(); // </lq>
         break;
     case Atom::RawString:
         if (atom->string() == " ")
@@ -1293,41 +1429,44 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         if (atom->string().startsWith("&"))
             writeCharacters(atom->string());
         else if (atom->string() == "<sup>*</sup>") {
-            xmlWriter().writeStartElement("sup");
+            writeStartTag(DT_sup);
             writeCharacters("*");
-            xmlWriter().writeEndElement(); // </sup>
+            writeEndTag(); // </sup>
+        }
+        else if (atom->string() == "<sup>&reg;</sup>") {
+            writeStartTag(DT_tm);
+            xmlWriter().writeAttribute("tmtype","reg");
+            writeEndTag(); // </tm>
         }
         else {
-            xmlWriter().writeStartElement("pre");
+            writeStartTag(DT_pre);
             xmlWriter().writeAttribute("outputclass","raw-html");
             writeCharacters(atom->string());
-            xmlWriter().writeEndElement(); // </pre>
+            writeEndTag(); // </pre>
         }
         break;
     case Atom::SectionLeft:
-        if (inSection || inApiDesc) {
+#if 0        
+        if (inApiDesc) {
+            writeEndTag(); // </apiDesc>
             inApiDesc = false;
-            xmlWriter().writeEndElement(); // </section> or </apiDesc>
         }
-        inSection = true;
-        xmlWriter().writeStartElement("section");
-        writeGuidAttribute(Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
-        xmlWriter().writeAttribute("outputclass","details");
+#endif        
+        enterSection("details",QString());
+        //writeGuidAttribute(Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
         break;
     case Atom::SectionRight:
-        if (inSection) {
-            inSection = false;
-            xmlWriter().writeEndElement(); // </section>
-        }
+        leaveSection();
         break;
     case Atom::SectionHeadingLeft:
-        xmlWriter().writeStartElement("title");
+        writeStartTag(DT_p);
+        writeGuidAttribute(Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
         hx = "h" + QString::number(atom->string().toInt() + hOffset(relative));
         xmlWriter().writeAttribute("outputclass",hx);
         inSectionHeading = true;
         break;
     case Atom::SectionHeadingRight:
-        xmlWriter().writeEndElement(); // </title> (see case Atom::SectionHeadingLeft)
+        writeEndTag(); // </title> (see case Atom::SectionHeadingLeft)
         inSectionHeading = false;
         break;
     case Atom::SidebarLeft:
@@ -1347,97 +1486,144 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::TableLeft:
         {
             if (in_para) {
-                xmlWriter().writeEndElement(); // </p>
+                writeEndTag(); // </p>
                 in_para = false;
             }
-            xmlWriter().writeStartElement("table");
+            writeStartTag(DT_table);
             numTableRows = 0;
             if (tableColumnCount != 0) {
                 qDebug() << "ERROR: Nested tables!";
                 tableColumnCount = 0;
             }
             tableColumnCount = countTableColumns(atom->next());
-            xmlWriter().writeStartElement("tgroup");
+            writeStartTag(DT_tgroup);
             xmlWriter().writeAttribute("cols",QString::number(tableColumnCount));
             inTableHeader = false;
             inTableBody = false;
         }
         break;
     case Atom::TableRight:
-        xmlWriter().writeEndElement(); // </tbody>
-        xmlWriter().writeEndElement(); // </tgroup>
-        xmlWriter().writeEndElement(); // </table>
+        writeEndTag(); // </tbody>
+        writeEndTag(); // </tgroup>
+        writeEndTag(); // </table>
         inTableHeader = false;
         inTableBody = false;
         tableColumnCount = 0;
         break;
     case Atom::TableHeaderLeft:
         if (inTableBody) {
-            xmlWriter().writeEndElement(); // </tbody>
-            xmlWriter().writeEndElement(); // </tgroup>
-            xmlWriter().writeEndElement(); // </table>
+            writeEndTag(); // </tbody>
+            writeEndTag(); // </tgroup>
+            writeEndTag(); // </table>
             inTableHeader = false;
             inTableBody = false;
             tableColumnCount = 0;
-            xmlWriter().writeStartElement("table");
+            writeStartTag(DT_table);
             numTableRows = 0;
             tableColumnCount = countTableColumns(atom);
-            xmlWriter().writeStartElement("tgroup");
+            writeStartTag(DT_tgroup);
             xmlWriter().writeAttribute("cols",QString::number(tableColumnCount));
         }
-        xmlWriter().writeStartElement("thead");
+        writeStartTag(DT_thead);
         xmlWriter().writeAttribute("valign","top");
-        xmlWriter().writeStartElement("row");
+        writeStartTag(DT_row);
         xmlWriter().writeAttribute("valign","top");
         inTableHeader = true;
         inTableBody = false;
         break;
     case Atom::TableHeaderRight:
-        xmlWriter().writeEndElement(); // </row>
+        writeEndTag(); // </row>
         if (matchAhead(atom, Atom::TableHeaderLeft)) {
             skipAhead = 1;
-            xmlWriter().writeStartElement("row");
+            writeStartTag(DT_row);
             xmlWriter().writeAttribute("valign","top");
         }
         else { 
-            xmlWriter().writeEndElement(); // </thead>
+            writeEndTag(); // </thead>
             inTableHeader = false;
             inTableBody = true;
-            xmlWriter().writeStartElement("tbody");
+            writeStartTag(DT_tbody);
         }
         break;
     case Atom::TableRowLeft:
         if (!inTableHeader && !inTableBody) {
             inTableBody = true;
-            xmlWriter().writeStartElement("tbody");
+            writeStartTag(DT_tbody);
+        }
+        writeStartTag(DT_row);
+        attr = atom->string();
+        if (!attr.isEmpty()) {
+            if (attr.contains('=')) {
+                int index = 0;
+                int from = 0;
+                QString values;
+                while (index >= 0) {
+                    index = attr.indexOf('"',from);
+                    if (index >= 0) {
+                        ++index;
+                        from = index;
+                        index = attr.indexOf('"',from);
+                        if (index > from) {
+                            if (!values.isEmpty())
+                                values.append(' ');
+                            values += attr.mid(from,index-from);
+                            from = index+1;
+                        }
+                    }
+                }
+                attr = values;
+            }
+            xmlWriter().writeAttribute("outputclass", attr);
         }
-        xmlWriter().writeStartElement("row");
         xmlWriter().writeAttribute("valign","top");
         break;
     case Atom::TableRowRight:
-        xmlWriter().writeEndElement(); // </row>
+        writeEndTag(); // </row>
         break;
     case Atom::TableItemLeft:
         {
-            xmlWriter().writeStartElement("entry");
-            QStringList spans = atom->string().split(",");
-            if (spans.size() == 2) {
-                if (inTableHeader ||
-                    (spans[0].toInt() != 1) ||
-                    (spans[1].toInt() != 1)) {
-                    QString s = "span(" + spans[0] + "," + spans[1] + ")";
-                    xmlWriter().writeAttribute("outputclass",s);
+            QString values = "";
+            writeStartTag(DT_entry);
+            for (int i=0; i<atom->count(); ++i) {
+                attr = atom->string(i);
+                if (attr.contains('=')) {
+                    int index = 0;
+                    int from = 0;
+                    while (index >= 0) {
+                        index = attr.indexOf('"',from);
+                        if (index >= 0) {
+                            ++index;
+                            from = index;
+                            index = attr.indexOf('"',from);
+                            if (index > from) {
+                                if (!values.isEmpty())
+                                    values.append(' ');
+                                values += attr.mid(from,index-from);
+                                from = index+1;
+                            }
+                        }
+                    }
+                }
+                else {
+                    QStringList spans = attr.split(",");
+                    if (spans.size() == 2) {
+                        if ((spans[0].toInt()>1) || (spans[1].toInt()>1)) {
+                            values += "span(" + spans[0] + "," + spans[1] + ")";
+                        }
+                    }
                 }
             }
+            if (!values.isEmpty())
+                xmlWriter().writeAttribute("outputclass",values);
             if (matchAhead(atom, Atom::ParaLeft))
                 skipAhead = 1;
         }
         break;
     case Atom::TableItemRight:
         if (inTableHeader)
-            xmlWriter().writeEndElement(); // </entry>
+            writeEndTag(); // </entry>
         else {
-            xmlWriter().writeEndElement(); // </entry>
+            writeEndTag(); // </entry>
         }
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
@@ -1473,26 +1659,26 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::Target:
         if (in_para) {
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             in_para = false;
         }
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         writeGuidAttribute(Doc::canonicalTitle(atom->string()));
         xmlWriter().writeAttribute("outputclass","target");
         //xmlWriter().writeCharacters(protectEnc(atom->string()));
-        xmlWriter().writeEndElement(); // </p>
+        writeEndTag(); // </p>
         break;
     case Atom::UnhandledFormat:
-        xmlWriter().writeStartElement("b");
+        writeStartTag(DT_b);
         xmlWriter().writeAttribute("outputclass","error");
         xmlWriter().writeCharacters("<Missing DITAXML>");
-        xmlWriter().writeEndElement(); // </b>
+        writeEndTag(); // </b>
         break;
     case Atom::UnknownCommand:
-        xmlWriter().writeStartElement("b");
+        writeStartTag(DT_b);
         xmlWriter().writeAttribute("outputclass","error unknown-command");
         writeCharacters(protectEnc(atom->string()));
-        xmlWriter().writeEndElement(); // </b>
+        writeEndTag(); // </b>
         break;
     case Atom::QmlText:
     case Atom::EndQmlText:
@@ -1532,85 +1718,81 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
          */
         generateHeader(inner, fullTitle);
         generateBrief(inner, marker); // <shortdesc>
-
-        // not included: <prolog>
-    
-        xmlWriter().writeStartElement(CXXCLASSDETAIL);
-        xmlWriter().writeStartElement(CXXCLASSDEFINITION);
+        writeProlog(inner,marker);
+            
+        writeStartTag(DT_cxxClassDetail);
+        writeStartTag(DT_cxxClassDefinition);
         writeLocation(nsn);
-        xmlWriter().writeEndElement(); // <cxxClassDefinition>
+        writeEndTag(); // <cxxClassDefinition>
 
-        xmlWriter().writeStartElement("apiDesc");
-        xmlWriter().writeAttribute("spectitle",title);
+        enterApiDesc(QString(),title);
         Text brief = nsn->doc().briefText(); // zzz
         if (!brief.isEmpty()) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             generateText(brief, nsn, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
         }
         generateIncludes(nsn, marker);
         generateStatus(nsn, marker);
         generateThreadSafeness(nsn, marker);
         generateSince(nsn, marker);
-        xmlWriter().writeEndElement(); // </apiDesc>
+
+        enterSection("h2","Detailed Description");
+        generateBody(nsn, marker);
+        leaveSection();
+        leaveSection(); // </apiDesc>
 
         bool needOtherSection = false;
         QList<Section> summarySections;
         summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-        s = summarySections.begin();
-        while (s != summarySections.end()) {
-            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
-                if (!s->inherited.isEmpty())
-                    needOtherSection = true;
-            }
-            else {
-                QString attr;
-                if (!s->members.isEmpty()) {
-                    xmlWriter().writeStartElement("section");
-                    attr = cleanRef((*s).name).toLower() + " redundant";
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc((*s).name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->members, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-                if (!s->reimpMembers.isEmpty()) {
-                    QString name = QString("Reimplemented ") + (*s).name;
-                    attr = cleanRef(name).toLower() + " redundant";
-                    xmlWriter().writeStartElement("section");
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc(name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-            }
-            ++s;
-        }
-        if (needOtherSection) {
-            xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
-            xmlWriter().writeStartElement("title");
-            xmlWriter().writeAttribute("outputclass","h3");
-            xmlWriter().writeCharacters("Additional Inherited Members");
-            xmlWriter().writeEndElement(); // </title>
+        if (!summarySections.isEmpty()) {
+            enterSection("redundant",QString());
             s = summarySections.begin();
             while (s != summarySections.end()) {
-                if (s->members.isEmpty())
-                    generateSectionInheritedList(*s, inner, marker);
+                if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                    if (!s->inherited.isEmpty())
+                        needOtherSection = true;
+                }
+                else {
+                    QString attr;
+                    if (!s->members.isEmpty()) {
+                        writeStartTag(DT_p);
+                        attr  = cleanRef((*s).name).toLower() + " h2"; 
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc((*s).name));
+                        writeEndTag(); // </title>
+                        generateSection(s->members, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                    if (!s->reimpMembers.isEmpty()) {
+                        QString name = QString("Reimplemented ") + (*s).name;
+                        attr = cleanRef(name).toLower() + " h2";
+                        writeStartTag(DT_p);
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc(name));
+                        writeEndTag(); // </title>
+                        generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                }
                 ++s;
             }
-            xmlWriter().writeEndElement(); // </section>
+            if (needOtherSection) {
+                writeStartTag(DT_p);
+                xmlWriter().writeAttribute("outputclass","h3");
+                xmlWriter().writeCharacters("Additional Inherited Members");
+                writeEndTag(); // </title>
+                s = summarySections.begin();
+                while (s != summarySections.end()) {
+                    if (s->members.isEmpty())
+                        generateSectionInheritedList(*s, inner, marker);
+                    ++s;
+                }
+            }
+            leaveSection();
         }
-        
-        writeDetailedDescription(nsn, marker, false, QString("Detailed Description"));
-        xmlWriter().writeEndElement(); // </cxxClassDetail>
+
+        writeEndTag(); // </cxxClassDetail>
 
         // not included: <related-links>
         // not included: <cxxClassNested>
@@ -1646,7 +1828,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
 
         generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
         generateLowStatusMembers(inner,marker,CodeMarker::Compat);
-        xmlWriter().writeEndElement(); // </cxxClass>
+        writeEndTag(); // </cxxClass>
     }
     else if (inner->type() == Node::Class) {
         const ClassNode* cn = const_cast<ClassNode*>(static_cast<const ClassNode*>(inner));
@@ -1656,34 +1838,32 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
 
         generateHeader(inner, fullTitle);
         generateBrief(inner, marker); // <shortdesc>
-
-        // not included: <prolog>
+        writeProlog(inner,marker);
     
-        xmlWriter().writeStartElement(CXXCLASSDETAIL);
-        xmlWriter().writeStartElement(CXXCLASSDEFINITION);
-        xmlWriter().writeStartElement(CXXCLASSACCESSSPECIFIER);
+        writeStartTag(DT_cxxClassDetail);
+        writeStartTag(DT_cxxClassDefinition);
+        writeStartTag(DT_cxxClassAccessSpecifier);
         xmlWriter().writeAttribute("value",inner->accessString());
-        xmlWriter().writeEndElement(); // <cxxClassAccessSpecifier>
+        writeEndTag(); // <cxxClassAccessSpecifier>
         if (cn->isAbstract()) {
-            xmlWriter().writeStartElement(CXXCLASSABSTRACT);
+            writeStartTag(DT_cxxClassAbstract);
             xmlWriter().writeAttribute("name","abstract");
             xmlWriter().writeAttribute("value","abstract");
-            xmlWriter().writeEndElement(); // </cxxClassAbstract>
+            writeEndTag(); // </cxxClassAbstract>
         }
         writeDerivations(cn, marker); // <cxxClassDerivations>
 
         // not included: <cxxClassTemplateParameters>
 
         writeLocation(cn);
-        xmlWriter().writeEndElement(); // <cxxClassDefinition>
+        writeEndTag(); // <cxxClassDefinition>
 
-        xmlWriter().writeStartElement("apiDesc");
-        xmlWriter().writeAttribute("spectitle",title);
+        enterApiDesc(QString(),title);
         Text brief = cn->doc().briefText(); // zzz
         if (!brief.isEmpty()) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             generateText(brief, cn, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
         }
         generateIncludes(cn, marker);
         generateStatus(cn, marker);
@@ -1691,68 +1871,64 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
         generateInheritedBy(cn, marker);
         generateThreadSafeness(cn, marker);
         generateSince(cn, marker);
-        xmlWriter().writeEndElement(); // </apiDesc>
+        enterSection("h2","Detailed Description");
+        generateBody(cn, marker);
+        leaveSection();
+        leaveSection(); // </apiDesc>
 
         bool needOtherSection = false;
         QList<Section> summarySections;
         summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-        s = summarySections.begin();
-        while (s != summarySections.end()) {
-            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
-                if (!s->inherited.isEmpty())
-                    needOtherSection = true;
-            }
-            else {
-                QString attr;
-                if (!s->members.isEmpty()) {
-                    xmlWriter().writeStartElement("section");
-                    attr = cleanRef((*s).name).toLower() + " redundant";
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc((*s).name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->members, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-                if (!s->reimpMembers.isEmpty()) {
-                    QString name = QString("Reimplemented ") + (*s).name;
-                    attr = cleanRef(name).toLower() + " redundant";
-                    xmlWriter().writeStartElement("section");
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc(name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-            }
-            ++s;
-        }
-        if (needOtherSection) {
-            xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
-            xmlWriter().writeStartElement("title");
-            xmlWriter().writeAttribute("outputclass","h3");
-            xmlWriter().writeCharacters("Additional Inherited Members");
-            xmlWriter().writeEndElement(); // </title>
+        if (!summarySections.isEmpty()) {
+            enterSection("redundant",QString());
             s = summarySections.begin();
             while (s != summarySections.end()) {
-                if (s->members.isEmpty())
-                    generateSectionInheritedList(*s, inner, marker);
+                if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                    if (!s->inherited.isEmpty())
+                        needOtherSection = true;
+                }
+                else {
+                    QString attr;
+                    if (!s->members.isEmpty()) {
+                        writeStartTag(DT_p);
+                        attr = cleanRef((*s).name).toLower() + " h2";
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc((*s).name));
+                        writeEndTag(); // </p>
+                        generateSection(s->members, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                    if (!s->reimpMembers.isEmpty()) {
+                        QString name = QString("Reimplemented ") + (*s).name;
+                        attr = cleanRef(name).toLower() + " h2";
+                        writeStartTag(DT_p);
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc(name));
+                        writeEndTag(); // </p>
+                        generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                }
                 ++s;
             }
-            xmlWriter().writeEndElement(); // </section>
+            if (needOtherSection) {
+                writeStartTag(DT_p);
+                xmlWriter().writeAttribute("outputclass","h3");
+                xmlWriter().writeCharacters("Additional Inherited Members");
+                writeEndTag(); // </p>
+                s = summarySections.begin();
+                while (s != summarySections.end()) {
+                    if (s->members.isEmpty())
+                        generateSectionInheritedList(*s, inner, marker);
+                    ++s;
+                }
+            }
+            leaveSection();
         }
-        
-        writeDetailedDescription(cn, marker, false, QString("Detailed Description"));
 
         // not included: <example> or <apiImpl>
 
-        xmlWriter().writeEndElement(); // </cxxClassDetail>
+        writeEndTag(); // </cxxClassDetail>
 
         // not included: <related-links>
         // not included: <cxxClassNested>
@@ -1782,7 +1958,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
 
         generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
         generateLowStatusMembers(inner,marker,CodeMarker::Compat);
-        xmlWriter().writeEndElement(); // </cxxClass>
+        writeEndTag(); // </cxxClass>
     }
     else if ((inner->type() == Node::Fake) && (inner->subType() == Node::HeaderFile)) {
         const FakeNode* fn = const_cast<FakeNode*>(static_cast<const FakeNode*>(inner));
@@ -1798,78 +1974,78 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
          */
         generateHeader(inner, fullTitle);
         generateBrief(inner, marker); // <shortdesc>
-        xmlWriter().writeStartElement(CXXCLASSDETAIL);
-        xmlWriter().writeStartElement("apiDesc");
-        xmlWriter().writeAttribute("spectitle",title);
+        writeProlog(inner,marker);
+
+        writeStartTag(DT_cxxClassDetail);
+        enterApiDesc(QString(),title);
         Text brief = fn->doc().briefText(); // zzz
         if (!brief.isEmpty()) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             generateText(brief, fn, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
         }
         generateIncludes(fn, marker);
         generateStatus(fn, marker);
         generateThreadSafeness(fn, marker);
         generateSince(fn, marker);
-        xmlWriter().writeEndElement(); // </apiDesc>
+        generateSince(fn, marker);
+        enterSection("h2","Detailed Description");
+        generateBody(fn, marker);
+        leaveSection();
+        leaveSection(); // </apiDesc>
 
         bool needOtherSection = false;
         QList<Section> summarySections;
         summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-        s = summarySections.begin();
-        while (s != summarySections.end()) {
-            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
-                if (!s->inherited.isEmpty())
-                    needOtherSection = true;
-            }
-            else {
-                QString attr;
-                if (!s->members.isEmpty()) {
-                    xmlWriter().writeStartElement("section");
-                    attr = cleanRef((*s).name).toLower() + " redundant";
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc((*s).name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->members, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-                if (!s->reimpMembers.isEmpty()) {
-                    QString name = QString("Reimplemented ") + (*s).name;
-                    attr = cleanRef(name).toLower() + " redundant";
-                    xmlWriter().writeStartElement("section");
-                    xmlWriter().writeAttribute("outputclass",attr);
-                    xmlWriter().writeStartElement("title");
-                    xmlWriter().writeAttribute("outputclass","h2");
-                    writeCharacters(protectEnc(name));
-                    xmlWriter().writeEndElement(); // </title>
-                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
-                    generateSectionInheritedList(*s, inner, marker);
-                    xmlWriter().writeEndElement(); // </section>
-                }
-            }
-            ++s;
-        }
-        if (needOtherSection) {
-            xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
-            xmlWriter().writeStartElement("title");
-            xmlWriter().writeAttribute("outputclass","h3");
-            xmlWriter().writeCharacters("Additional Inherited Members");
-            xmlWriter().writeEndElement(); // </title>
+        if (!summarySections.isEmpty()) {
+            enterSection("redundant",QString());
             s = summarySections.begin();
             while (s != summarySections.end()) {
-                if (s->members.isEmpty())
-                    generateSectionInheritedList(*s, inner, marker);
+                if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                    if (!s->inherited.isEmpty())
+                        needOtherSection = true;
+                }
+                else {
+                    QString attr;
+                    if (!s->members.isEmpty()) {
+                        writeStartTag(DT_p);
+                        attr = cleanRef((*s).name).toLower() + " h2";
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc((*s).name));
+                        writeEndTag(); // </p>
+                        generateSection(s->members, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                    if (!s->reimpMembers.isEmpty()) {
+                        QString name = QString("Reimplemented ") + (*s).name;
+                        attr = cleanRef(name).toLower() + " h2";
+                        writeStartTag(DT_p);
+                        xmlWriter().writeAttribute("outputclass",attr);
+                        writeCharacters(protectEnc(name));
+                        writeEndTag(); // </p>
+                        generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                        generateSectionInheritedList(*s, inner, marker);
+                    }
+                }
                 ++s;
             }
-            xmlWriter().writeEndElement(); // </section>
+            if (needOtherSection) {
+                enterSection("additional-inherited-members redundant",QString());
+                writeStartTag(DT_p);
+                xmlWriter().writeAttribute("outputclass","h3");
+                xmlWriter().writeCharacters("Additional Inherited Members");
+                writeEndTag(); // </p>
+                s = summarySections.begin();
+                while (s != summarySections.end()) {
+                    if (s->members.isEmpty())
+                        generateSectionInheritedList(*s, inner, marker);
+                    ++s;
+                }
+            }
+            leaveSection();
         }
-        
-        writeDetailedDescription(fn, marker, false, QString("Detailed Description"));
-        xmlWriter().writeEndElement(); // </cxxClassDetail>
+
+        writeEndTag(); // </cxxClassDetail>
 
         // not included: <related-links>
         // not included: <cxxClassNested>
@@ -1904,7 +2080,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
         }
         generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
         generateLowStatusMembers(inner,marker,CodeMarker::Compat);
-        xmlWriter().writeEndElement(); // </cxxClass>
+        writeEndTag(); // </cxxClass>
     }
     else if ((inner->type() == Node::Fake) && (inner->subType() == Node::QmlClass)) {
         const QmlClassNode* qcn = const_cast<QmlClassNode*>(static_cast<const QmlClassNode*>(inner));
@@ -1917,76 +2093,74 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
 
         generateHeader(inner, fullTitle);
         generateBrief(inner, marker); // <shortdesc>
+        writeProlog(inner,marker);
 
-        // not included: <prolog>
-    
-        xmlWriter().writeStartElement(CXXCLASSDETAIL);
-        xmlWriter().writeStartElement("apiDesc");
-        xmlWriter().writeAttribute("spectitle",title);
+        writeStartTag(DT_cxxClassDetail);
+        enterApiDesc(QString(),title);
         Text brief = qcn->doc().briefText(); // zzz
         if (!brief.isEmpty()) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             generateText(brief, qcn, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
         }
         generateQmlInstantiates(qcn, marker);
         generateQmlInherits(qcn, marker);
         generateQmlInheritedBy(qcn, marker);
         generateSince(qcn, marker);
-        xmlWriter().writeEndElement(); // </apiDesc>
+        enterSection("h2","Detailed Description");
+        generateBody(qcn, marker);
+        if (cn)
+            generateQmlText(cn->doc().body(), cn, marker, qcn->name());
+        leaveSection();
+        leaveSection(); // </apiDesc>
 
         QList<Section> summarySections;
         summarySections = marker->qmlSections(qcn,CodeMarker::Summary,0);
-        s = summarySections.begin();
-        while (s != summarySections.end()) {
-            QString attr;
-            if (!s->members.isEmpty()) {
-                xmlWriter().writeStartElement("section");
-                attr = cleanRef((*s).name).toLower() + " redundant";
-                xmlWriter().writeAttribute("outputclass",attr);
-                xmlWriter().writeStartElement("title");
-                xmlWriter().writeAttribute("outputclass","h2");
-                writeCharacters(protectEnc((*s).name));
-                xmlWriter().writeEndElement(); // </title>
-                generateQmlSummary(*s,qcn,marker);
-                //generateSection(s->members, inner, marker, CodeMarker::Summary);
-                //generateSectionInheritedList(*s, inner, marker);
-                xmlWriter().writeEndElement(); // </section>
+        if (!summarySections.isEmpty()) {
+            enterSection("redundant",QString());
+            s = summarySections.begin();
+            while (s != summarySections.end()) {
+                QString attr;
+                if (!s->members.isEmpty()) {
+                    writeStartTag(DT_p);
+                    attr = cleanRef((*s).name).toLower() + " h2";
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    writeCharacters(protectEnc((*s).name));
+                    writeEndTag(); // </p>
+                    generateQmlSummary(*s,qcn,marker);
+                    //generateSection(s->members, inner, marker, CodeMarker::Summary);
+                    //generateSectionInheritedList(*s, inner, marker);
+                }
+                ++s;
             }
-            ++s;
+            leaveSection();
         }
-        
-        writeDetailedDescription(qcn, marker, false, QString("Detailed Description"));
-        if (cn)
-            generateQmlText(cn->doc().body(), cn, marker, qcn->name());
 
         QList<Section> detailSections;
         detailSections = marker->qmlSections(qcn,CodeMarker::Detailed,0);
-        s = detailSections.begin();
-        while (s != detailSections.end()) {
-            if (!s->members.isEmpty()) {
-                QString attr;
-                inSection = true;
-                xmlWriter().writeStartElement("section");
-                attr = cleanRef((*s).name).toLower();
-                xmlWriter().writeAttribute("outputclass",attr);
-                xmlWriter().writeStartElement("title");
-                xmlWriter().writeAttribute("outputclass","h2");
-                writeCharacters(protectEnc((*s).name));
-                xmlWriter().writeEndElement(); // </title>
-                NodeList::ConstIterator m = (*s).members.begin();
-                while (m != (*s).members.end()) {
-                    generateDetailedQmlMember(*m, qcn, marker);
-                    ++m;
+        if (!detailSections.isEmpty()) {
+            enterSection("details",QString());
+            s = detailSections.begin();
+            while (s != detailSections.end()) {
+                if (!s->members.isEmpty()) {
+                    QString attr;
+                    writeStartTag(DT_p);
+                    attr = cleanRef((*s).name).toLower() + " h2";
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    writeCharacters(protectEnc((*s).name));
+                    writeEndTag(); // </p>
+                    NodeList::ConstIterator m = (*s).members.begin();
+                    while (m != (*s).members.end()) {
+                        generateDetailedQmlMember(*m, qcn, marker);
+                        ++m;
+                    }
                 }
-                xmlWriter().writeEndElement(); // </section>
-                inSection = false;
+                ++s;
             }
-            ++s;
+            leaveSection();
         }
-
-        xmlWriter().writeEndElement(); // </cxxClassDetail>        
-        xmlWriter().writeEndElement(); // </cxxClass>
+        writeEndTag(); // </cxxClassDetail>        
+        writeEndTag(); // </cxxClass>
     }
 }
 
@@ -1996,12 +2170,13 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark
  */
 void DitaXmlGenerator::writeXrefListItem(const QString& link, const QString& text)
 {
-    xmlWriter().writeStartElement("li");
-    xmlWriter().writeStartElement("xref");
+    writeStartTag(DT_li);
+    writeStartTag(DT_xref);
+    // formathtml
     xmlWriter().writeAttribute("href",link);
     writeCharacters(text);
-    xmlWriter().writeEndElement(); // </xref>
-    xmlWriter().writeEndElement(); // </li>
+    writeEndTag(); // </xref>
+    writeEndTag(); // </li>
 }
 
 /*!
@@ -2010,45 +2185,31 @@ void DitaXmlGenerator::writeXrefListItem(const QString& link, const QString& tex
  */
 void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker)
 {
-    SubTitleSize subTitleSize = LargeSubTitle;
     QList<Section> sections;
     QList<Section>::const_iterator s;
     QString fullTitle = fake->fullTitle();
-    QString htmlTitle = fullTitle;
 
-    if (fake->subType() == Node::File && !fake->subTitle().isEmpty()) {
-        subTitleSize = SmallSubTitle;
-        htmlTitle += " (" + fake->subTitle() + ")";
-    }
-    else if (fake->subType() == Node::QmlBasicType) {
+    if (fake->subType() == Node::QmlBasicType) {
         fullTitle = "QML Basic Type: " + fullTitle;
-        htmlTitle = fullTitle;
     }
 
     generateHeader(fake, fullTitle);
     generateBrief(fake, marker); // <shortdesc>
-    xmlWriter().writeStartElement("body");
+    writeProlog(fake, marker);
+
+    writeStartTag(DT_body);
+    enterSection(QString(),QString());
     if (fake->subType() == Node::Module) {
         generateStatus(fake, marker);
         if (moduleNamespaceMap.contains(fake->name())) {
-            xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","namespaces");
-            xmlWriter().writeStartElement("title");
-            xmlWriter().writeAttribute("outputclass","h2");
-            xmlWriter().writeCharacters("Namespaces");
-            xmlWriter().writeEndElement(); // </title>
+            enterSection("h2","Namespaces");
             generateAnnotatedList(fake, marker, moduleNamespaceMap[fake->name()]);
-            xmlWriter().writeEndElement(); // </section>
+            leaveSection();
         }
         if (moduleClassMap.contains(fake->name())) {
-            xmlWriter().writeStartElement("section");
-            xmlWriter().writeAttribute("outputclass","classes");
-            xmlWriter().writeStartElement("title");
-            xmlWriter().writeAttribute("outputclass","h2");
-            xmlWriter().writeCharacters("Classes");
-            xmlWriter().writeEndElement(); // </title>
+            enterSection("h2","Classes");
             generateAnnotatedList(fake, marker, moduleClassMap[fake->name()]);
-            xmlWriter().writeEndElement(); // </section>
+            leaveSection();
         }
     }
 
@@ -2056,11 +2217,11 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker
         if (fake->subType() == Node::File) {
             Text text;
             Quoter quoter;
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             xmlWriter().writeAttribute("outputclass", "small-subtitle");
             text << fake->subTitle();
             generateText(text, fake, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             Doc::quoteFromFile(fake->doc().location(), quoter, fake->name());
             QString code = quoter.quoteTo(fake->location(), "", "");
             text.clear();
@@ -2070,10 +2231,12 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker
     }
     else {
         if (fake->subType() == Node::Module) {
-            writeDetailedDescription(fake, marker, false, QString("Detailed Description"));
+         enterSection("h2","Detailed Description");
+         generateBody(fake, marker);
+         leaveSection();
         }
         else
-            writeDetailedDescription(fake, marker, false, QString());
+            generateBody(fake, marker);
         generateAlsoList(fake, marker);
 
         if (!fake->groupMembers().isEmpty()) {
@@ -2085,9 +2248,10 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker
             generateAnnotatedList(fake, marker, groupMembersMap);
         }
     }
-    xmlWriter().writeEndElement(); // </body>
+    leaveSection(); // </section>
+    writeEndTag(); // </body>
     writeRelatedLinks(fake, marker);
-    xmlWriter().writeEndElement(); // </topic>
+    writeEndTag(); // </topic>
 }
 
 /*!
@@ -2102,13 +2266,13 @@ void DitaXmlGenerator::writeLink(const Node* node,
 {
     if (node) {
         QString link = fileName(node) + "#" + node->guid();
-        xmlWriter().writeStartElement("link");
+        writeStartTag(DT_link);
         xmlWriter().writeAttribute("href", link);
         xmlWriter().writeAttribute("role", role);
-        xmlWriter().writeStartElement("linktext");
+        writeStartTag(DT_linktext);
         writeCharacters(text);
-        xmlWriter().writeEndElement(); // </linktext>
-        xmlWriter().writeEndElement(); // </link>
+        writeEndTag(); // </linktext>
+        writeEndTag(); // </link>
     }
 }
 
@@ -2124,7 +2288,7 @@ void DitaXmlGenerator::writeRelatedLinks(const FakeNode* node, CodeMarker* marke
     const Node* linkNode = 0;
     QPair<QString,QString> linkPair;
     if (node && !node->links().empty()) {
-        xmlWriter().writeStartElement("related-links");
+        writeStartTag(DT_relatedLinks);
         if (node->links().contains(Node::PreviousLink)) {
             linkPair = node->links()[Node::PreviousLink];
             linkNode = findNodeForTarget(linkPair.first, node, marker);
@@ -2140,7 +2304,7 @@ void DitaXmlGenerator::writeRelatedLinks(const FakeNode* node, CodeMarker* marke
             linkNode = findNodeForTarget(linkPair.first, node, marker);
             writeLink(linkNode, linkPair.second, "parent");
         }
-        xmlWriter().writeEndElement(); // </related-links>
+        writeEndTag(); // </related-links>
     }
 }
 
@@ -2166,59 +2330,59 @@ void DitaXmlGenerator::generateHeader(const Node* node,
     if (!node)
         return;
 
+    DitaTag mainTag = DT_cxxClass;
+    DitaTag nameTag = DT_apiName;
     QString doctype;
-    QString mainElement;
-    QString nameElement;
     QString dtd;
     QString base;
     QString version;
     QString outputclass;
 
     if (node->type() == Node::Class) {
-        mainElement = "cxxClass";
-        nameElement = "apiName";
+        mainTag = DT_cxxClass;
+        nameTag = DT_apiName;
         dtd = "dtd/cxxClass.dtd";
         version = "0.6.0";
-        doctype = "<!DOCTYPE " + mainElement +
+        doctype = "<!DOCTYPE " + ditaTags[mainTag] +
             " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
             version + "//EN\" \"" + dtd + "\">";
     }
     else if (node->type() == Node::Namespace) {
-        mainElement = "cxxClass";
-        nameElement = "apiName";
+        mainTag = DT_cxxClass;
+        nameTag = DT_apiName;
         dtd = "dtd/cxxClass.dtd";
         version = "0.6.0";
-        doctype = "<!DOCTYPE " + mainElement +
+        doctype = "<!DOCTYPE " + ditaTags[mainTag] +
             " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
             version + "//EN\" \"" + dtd + "\">";
         outputclass = "namespace";
     }
     else if (node->type() == Node::Fake || subpage) {
         if (node->subType() == Node::HeaderFile) {
-            mainElement = "cxxClass";
-            nameElement = "apiName";
+            mainTag = DT_cxxClass;
+            nameTag = DT_apiName;
             dtd = "dtd/cxxClass.dtd";
             version = "0.6.0";
-            doctype = "<!DOCTYPE " + mainElement +
+            doctype = "<!DOCTYPE " + ditaTags[mainTag] +
                 " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
                 version + "//EN\" \"" + dtd + "\">";
             outputclass = "headerfile";
         }
         else if (node->subType() == Node::QmlClass) {
-            mainElement = "cxxClass";
-            nameElement = "apiName";
+            mainTag = DT_cxxClass;
+            nameTag = DT_apiName;
             dtd = "dtd/cxxClass.dtd";
             version = "0.6.0";
-            doctype = "<!DOCTYPE " + mainElement +
+            doctype = "<!DOCTYPE " + ditaTags[mainTag] +
                 " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
                 version + "//EN\" \"" + dtd + "\">";
             outputclass = "QML-class";
         }
         else {
-            mainElement = "topic";
-            nameElement = "title";
+            mainTag = DT_topic;
+            nameTag = DT_title;
             dtd = "dtd/topic.dtd";
-            doctype = "<!DOCTYPE " + mainElement +
+            doctype = "<!DOCTYPE " + ditaTags[mainTag] +
                 " PUBLIC \"-//OASIS//DTD DITA Topic//EN\" \"" + dtd + "\">";
             switch (node->subType()) {
             case Node::Page:
@@ -2250,13 +2414,13 @@ void DitaXmlGenerator::generateHeader(const Node* node,
 
     xmlWriter().writeDTD(doctype);
     xmlWriter().writeComment(node->doc().location().fileName());
-    xmlWriter().writeStartElement(mainElement);
+    writeStartTag(mainTag);
     xmlWriter().writeAttribute("id",node->guid());
     if (!outputclass.isEmpty())
         xmlWriter().writeAttribute("outputclass",outputclass);
-    xmlWriter().writeStartElement(nameElement); // <title> or <apiName>
+    writeStartTag(nameTag); // <title> or <apiName>
     writeCharacters(name);
-    xmlWriter().writeEndElement(); // </title> or </apiName> 
+    writeEndTag(); // </title> or </apiName> 
 }
 
 /*!
@@ -2277,9 +2441,9 @@ void DitaXmlGenerator::generateBrief(const Node* node, CodeMarker* marker)
 void DitaXmlGenerator::generateIncludes(const InnerNode* inner, CodeMarker* marker)
 {
     if (!inner->includes().isEmpty()) {
-        xmlWriter().writeStartElement("codeblock");
+        writeStartTag(DT_codeblock);
         writeText(marker->markedUpIncludes(inner->includes()), marker, inner);
-        xmlWriter().writeEndElement(); // </codeblock>
+        writeEndTag(); // </codeblock>
     }
 }
 
@@ -2551,20 +2715,20 @@ void DitaXmlGenerator::generateClassHierarchy(const Node* relative,
     QStack<NodeMap > stack;
     stack.push(topLevel);
 
-    xmlWriter().writeStartElement("ul");
+    writeStartTag(DT_ul);
     while (!stack.isEmpty()) {
         if (stack.top().isEmpty()) {
             stack.pop();
-            xmlWriter().writeEndElement(); // </ul>
+            writeEndTag(); // </ul>
             if (!stack.isEmpty())
-                xmlWriter().writeEndElement(); // </li>
+                writeEndTag(); // </li>
         }
         else {
             const ClassNode *child =
                 static_cast<const ClassNode *>(*stack.top().begin());
-            xmlWriter().writeStartElement("li");
+            writeStartTag(DT_li);
             generateFullName(child, relative, marker);
-            xmlWriter().writeEndElement(); // </li>
+            writeEndTag(); // </li>
             stack.top().erase(stack.top().begin());
 
             NodeMap newTop;
@@ -2574,8 +2738,8 @@ void DitaXmlGenerator::generateClassHierarchy(const Node* relative,
             }
             if (!newTop.isEmpty()) {
                 stack.push(newTop);
-                xmlWriter().writeStartElement("li");
-                xmlWriter().writeStartElement("ul");
+                writeStartTag(DT_li);
+                writeStartTag(DT_ul);
             }
         }
     }
@@ -2591,11 +2755,11 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
 {
     if (nodeMap.isEmpty())
         return;
-    xmlWriter().writeStartElement("table");
+    writeStartTag(DT_table);
     xmlWriter().writeAttribute("outputclass","annotated");
-    xmlWriter().writeStartElement("tgroup");
+    writeStartTag(DT_tgroup);
     xmlWriter().writeAttribute("cols","2");
-    xmlWriter().writeStartElement("tbody");
+    writeStartTag(DT_tbody);
 
     foreach (const QString& name, nodeMap.keys()) {
         const Node* node = nodeMap[name];
@@ -2603,35 +2767,35 @@ void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
         if (node->status() == Node::Obsolete)
             continue;
 
-        xmlWriter().writeStartElement("row");
-        xmlWriter().writeStartElement("entry");
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_row);
+        writeStartTag(DT_entry);
+        writeStartTag(DT_p);
         generateFullName(node, relative, marker);
-        xmlWriter().writeEndElement(); // </p>
-        xmlWriter().writeEndElement(); // <entry>
+        writeEndTag(); // </p>
+        writeEndTag(); // <entry>
 
         if (!(node->type() == Node::Fake)) {
             Text brief = node->doc().trimmedBriefText(name);
             if (!brief.isEmpty()) {
-                xmlWriter().writeStartElement("entry");
-                xmlWriter().writeStartElement("p");
+                writeStartTag(DT_entry);
+                writeStartTag(DT_p);
                 generateText(brief, node, marker);
-                xmlWriter().writeEndElement(); // </p>
-                xmlWriter().writeEndElement(); // <entry>
+                writeEndTag(); // </p>
+                writeEndTag(); // <entry>
             }
         }
         else {
-            xmlWriter().writeStartElement("entry");
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_entry);
+            writeStartTag(DT_p);
             writeCharacters(protectEnc(node->doc().briefText().toString())); // zzz
-            xmlWriter().writeEndElement(); // </p>
-            xmlWriter().writeEndElement(); // <entry>
+            writeEndTag(); // </p>
+            writeEndTag(); // <entry>
         }
-        xmlWriter().writeEndElement(); // </row>
+        writeEndTag(); // </row>
     }
-    xmlWriter().writeEndElement(); // </tbody>
-    xmlWriter().writeEndElement(); // </tgroup>
-    xmlWriter().writeEndElement(); // </table>
+    writeEndTag(); // </tbody>
+    writeEndTag(); // </tgroup>
+    writeEndTag(); // </table>
 }
 
 /*!
@@ -2768,26 +2932,27 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
       Output the alphabet as a row of links.
      */
     if (includeAlphabet) {
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         xmlWriter().writeAttribute("outputclass","alphabet");
         for (int i = 0; i < 26; i++) {
             QChar ch('a' + i);
             if (usedParagraphNames.contains(char('a' + i))) {
-                xmlWriter().writeStartElement("xref");
+                writeStartTag(DT_xref);
+                // formathtml
                 QString guid = lookupGuid(outFileName(),QString(ch));
                 QString attr = outFileName() + QString("#%1").arg(guid);
                 xmlWriter().writeAttribute("href", attr);
                 xmlWriter().writeCharacters(QString(ch.toUpper()));
-                xmlWriter().writeEndElement(); // </xref>
+                writeEndTag(); // </xref>
             }
         }
-        xmlWriter().writeEndElement(); // </p>
+        writeEndTag(); // </p>
     }
 
     /*
       Output a <p> element to contain all the <dl> elements.
      */
-    xmlWriter().writeStartElement("p");
+    writeStartTag(DT_p);
     xmlWriter().writeAttribute("outputclass","compactlist");
 
     for (int i=0; i<classMap.count()-1; i++) {
@@ -2802,25 +2967,25 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
         */
         if (curParOffset == 0) {
             if (i > 0) {
-                xmlWriter().writeEndElement(); // </dlentry>
-                xmlWriter().writeEndElement(); // </dl>
+                writeEndTag(); // </dlentry>
+                writeEndTag(); // </dl>
             }
-            xmlWriter().writeStartElement("dl");
-            xmlWriter().writeStartElement("dlentry");
-            xmlWriter().writeStartElement("dt");
+            writeStartTag(DT_dl);
+            writeStartTag(DT_dlentry);
+            writeStartTag(DT_dt);
             if (includeAlphabet) {
                 QChar c = paragraphName[curParNr][0].toLower();
                 writeGuidAttribute(QString(c));
             }
             xmlWriter().writeAttribute("outputclass","sublist-header");
             xmlWriter().writeCharacters(paragraphName[curParNr]);
-            xmlWriter().writeEndElement(); // </dt>
+            writeEndTag(); // </dt>
         }
 
         /*
           Output a <dd> for the current offset in the current paragraph.
          */
-        xmlWriter().writeStartElement("dd");
+        writeStartTag(DT_dd);
         if ((curParNr < NumParagraphs) &&
             !paragraphName[curParNr].isEmpty()) {
             NodeMap::Iterator it;
@@ -2832,7 +2997,8 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
               Previously, we used generateFullName() for this, but we
               require some special formatting.
             */
-            xmlWriter().writeStartElement("xref");
+            writeStartTag(DT_xref);
+            // formathtml
             xmlWriter().writeAttribute("href",linkForNode(it.value(), relative));
             
             QStringList pieces;
@@ -2841,19 +3007,19 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
             else
                 pieces = fullName(it.value(), relative, marker).split("::");
             xmlWriter().writeCharacters(protectEnc(pieces.last()));
-            xmlWriter().writeEndElement(); // </xref>
+            writeEndTag(); // </xref>
             if (pieces.size() > 1) {
                 xmlWriter().writeCharacters(" (");
                 generateFullName(it.value()->parent(),relative,marker);
                 xmlWriter().writeCharacters(")");
             }
         }
-        xmlWriter().writeEndElement(); // </dd>
+        writeEndTag(); // </dd>
         curParOffset++;
     }
-    xmlWriter().writeEndElement(); // </dlentry>
-    xmlWriter().writeEndElement(); // </dl>
-    xmlWriter().writeEndElement(); // </p>
+    writeEndTag(); // </dlentry>
+    writeEndTag(); // </dl>
+    writeEndTag(); // </p>
 }
 
 /*!
@@ -2862,34 +3028,35 @@ void DitaXmlGenerator::generateCompactList(const Node* relative,
 void DitaXmlGenerator::generateFunctionIndex(const Node* relative,
                                              CodeMarker* marker)
 {
-    xmlWriter().writeStartElement("p");
+    writeStartTag(DT_p);
     xmlWriter().writeAttribute("outputclass","alphabet");
     for (int i = 0; i < 26; i++) {
         QChar ch('a' + i);
-        xmlWriter().writeStartElement("xref");
+        writeStartTag(DT_xref);
+        // formathtml
         QString guid = lookupGuid(outFileName(),QString(ch));
         QString attr = outFileName() + QString("#%1").arg(guid);
         xmlWriter().writeAttribute("href", attr);
         xmlWriter().writeCharacters(QString(ch.toUpper()));
-        xmlWriter().writeEndElement(); // </xref>
+        writeEndTag(); // </xref>
         
     }
-    xmlWriter().writeEndElement(); // </p>
+    writeEndTag(); // </p>
 
     char nextLetter = 'a';
     char currentLetter;
 
-    xmlWriter().writeStartElement("ul");
+    writeStartTag(DT_ul);
     QMap<QString, NodeMap >::ConstIterator f = funcIndex.begin();
     while (f != funcIndex.end()) {
-        xmlWriter().writeStartElement("li");
+        writeStartTag(DT_li);
         currentLetter = f.key()[0].unicode();
         while (islower(currentLetter) && currentLetter >= nextLetter) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             writeGuidAttribute(QString(nextLetter));
             xmlWriter().writeAttribute("outputclass","target");
             xmlWriter().writeCharacters(QString(nextLetter));
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
             nextLetter++;
         }
         xmlWriter().writeCharacters(protectEnc(f.key()));
@@ -2900,10 +3067,10 @@ void DitaXmlGenerator::generateFunctionIndex(const Node* relative,
             generateFullName((*s)->parent(), relative, marker, *s);
             ++s;
         }
-        xmlWriter().writeEndElement(); // </li>
+        writeEndTag(); // </li>
         ++f;
     }
-    xmlWriter().writeEndElement(); // </ul>
+    writeEndTag(); // </ul>
 }
 
 /*!
@@ -2916,14 +3083,14 @@ void DitaXmlGenerator::generateLegaleseList(const Node* relative,
     while (it != legaleseTexts.end()) {
         Text text = it.key();
         generateText(text, relative, marker);
-        xmlWriter().writeStartElement("ul");
+        writeStartTag(DT_ul);
         do {
-            xmlWriter().writeStartElement("li");
+            writeStartTag(DT_li);
             generateFullName(it.value(), relative, marker);
-            xmlWriter().writeEndElement(); // </li>
+            writeEndTag(); // </li>
             ++it;
         } while (it != legaleseTexts.end() && it.key() == text);
-        xmlWriter().writeEndElement(); //</ul>
+        writeEndTag(); //</ul>
     }
 }
 
@@ -3044,50 +3211,53 @@ void DitaXmlGenerator::generateOverviewList(const Node* relative, CodeMarker* /*
     if (!fakeNodeMap.isEmpty()) {
         foreach (const QString& groupTitle, groupTitlesMap.keys()) {
             const FakeNode* groupNode = groupTitlesMap[groupTitle];
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             xmlWriter().writeAttribute("outputclass","h3");
-            xmlWriter().writeStartElement("xref");
+            writeStartTag(DT_xref);
+            // formathtml
             xmlWriter().writeAttribute("href",linkForNode(groupNode, relative));
             writeCharacters(protectEnc(groupNode->fullTitle()));
-            xmlWriter().writeEndElement(); // </xref>
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </xref>
+            writeEndTag(); // </p>
             if (fakeNodeMap[groupNode].count() == 0)
                 continue;
 
-            xmlWriter().writeStartElement("ul");
+            writeStartTag(DT_ul);
             foreach (const FakeNode* fakeNode, fakeNodeMap[groupNode]) {
                 QString title = fakeNode->fullTitle();
                 if (title.startsWith("The "))
                     title.remove(0, 4);
-                xmlWriter().writeStartElement("li");
-                xmlWriter().writeStartElement("xref");
+                writeStartTag(DT_li);
+                writeStartTag(DT_xref);
+                // formathtml
                 xmlWriter().writeAttribute("href",linkForNode(fakeNode, relative));
                 writeCharacters(protectEnc(title));
-                xmlWriter().writeEndElement(); // </xref>
-                xmlWriter().writeEndElement(); // </li>
+                writeEndTag(); // </xref>
+                writeEndTag(); // </li>
             }
-            xmlWriter().writeEndElement(); // </ul>
+            writeEndTag(); // </ul>
         }
     }
 
     if (!uncategorizedNodeMap.isEmpty()) {
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
         xmlWriter().writeAttribute("outputclass","h3");
         xmlWriter().writeCharacters("Miscellaneous");
-        xmlWriter().writeEndElement(); // </p>
-        xmlWriter().writeStartElement("ul");
+        writeEndTag(); // </p>
+        writeStartTag(DT_ul);
         foreach (const FakeNode *fakeNode, uncategorizedNodeMap) {
             QString title = fakeNode->fullTitle();
             if (title.startsWith("The "))
                 title.remove(0, 4);
-            xmlWriter().writeStartElement("li");
-            xmlWriter().writeStartElement("xref");
+            writeStartTag(DT_li);
+            writeStartTag(DT_xref);
+            // formathtml
             xmlWriter().writeAttribute("href",linkForNode(fakeNode, relative));
             writeCharacters(protectEnc(title));
-            xmlWriter().writeEndElement(); // </xref>
-            xmlWriter().writeEndElement(); // </li>
+            writeEndTag(); // </xref>
+            writeEndTag(); // </li>
         }
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </ul>
     }
 }
 
@@ -3102,18 +3272,18 @@ void DitaXmlGenerator::generateSection(const NodeList& nl,
                                        CodeMarker::SynopsisStyle style)
 {
     if (!nl.isEmpty()) {
-        xmlWriter().writeStartElement("ul");
+        writeStartTag(DT_ul);
         NodeList::ConstIterator m = nl.begin();
         while (m != nl.end()) {
             if ((*m)->access() != Node::Private) {
-                xmlWriter().writeStartElement("li");
+                writeStartTag(DT_li);
                 QString marked = getMarkedUpSynopsis(*m, relative, marker, style);
                 writeText(marked, marker, relative);
-                xmlWriter().writeEndElement(); // </li>
+                writeEndTag(); // </li>
             }
             ++m;
         }
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </ul>
     }
 }
 
@@ -3126,10 +3296,10 @@ void DitaXmlGenerator::generateSectionInheritedList(const Section& section,
 {
     if (section.inherited.isEmpty())
         return;
-    xmlWriter().writeStartElement("ul");
+    writeStartTag(DT_ul);
     QList<QPair<ClassNode*,int> >::ConstIterator p = section.inherited.begin();
     while (p != section.inherited.end()) {
-        xmlWriter().writeStartElement("li");
+        writeStartTag(DT_li);
         QString text;
         text.setNum((*p).second);
         text += " ";
@@ -3139,18 +3309,19 @@ void DitaXmlGenerator::generateSectionInheritedList(const Section& section,
             text += section.pluralMember;
         text += " inherited from ";
         writeCharacters(text);
-        xmlWriter().writeStartElement("xref");
+        writeStartTag(DT_xref);
+        // formathtml
         // zzz
         text = fileName((*p).first) + "#";
         text += DitaXmlGenerator::cleanRef(section.name.toLower());
         xmlWriter().writeAttribute("href",text);
         text = protectEnc(marker->plainFullName((*p).first, relative));
         writeCharacters(text);
-        xmlWriter().writeEndElement(); // </xref>
-        xmlWriter().writeEndElement(); // </li>
+        writeEndTag(); // </xref>
+        writeEndTag(); // </li>
         ++p;
     }
-    xmlWriter().writeEndElement(); // </ul>
+    writeEndTag(); // </ul>
 }
 
 /*!
@@ -3299,18 +3470,18 @@ void DitaXmlGenerator::writeText(const QString& markedCode,
                             writeCharacters(html);
                             html.clear();
                         }
-                        xmlWriter().writeStartElement("i");
+                        writeStartTag(DT_i);
                         writeCharacters(arg.toString());
-                        xmlWriter().writeEndElement(); // </i>
+                        writeEndTag(); // </i>
                     }
                     else if (k == 5) { // <@extra>
                         if (!html.isEmpty()) {
                             writeCharacters(html);
                             html.clear();
                         }
-                        xmlWriter().writeStartElement("tt");
+                        writeStartTag(DT_tt);
                         writeCharacters(arg.toString());
-                        xmlWriter().writeEndElement(); // </tt>
+                        writeEndTag(); // </tt>
                     }
                     else {
                         if (!html.isEmpty()) {
@@ -3362,10 +3533,10 @@ void DitaXmlGenerator::generateLink(const Atom* atom,
         writeCharacters(protectEnc(atom->string().left(k)));
         if (link.isEmpty()) {
             if (showBrokenLinks)
-                xmlWriter().writeEndElement(); // </i>
+                writeEndTag(); // </i>
         }
         else
-            xmlWriter().writeEndElement(); // </xref>
+            writeEndTag(); // </xref>
         inLink = false;
         writeCharacters(protectEnc(atom->string().mid(k)));
     }
@@ -3374,12 +3545,12 @@ void DitaXmlGenerator::generateLink(const Atom* atom,
         bool func = atom->string().endsWith("()");
         bool tt = (func || atom->string().contains(camelCase));
         if (tt)
-            xmlWriter().writeStartElement("tt");
+            writeStartTag(DT_tt);
         if (func)
             writeCharacters(protectEnc(atom->string().left(atom->string().length() - 2)));
         else
             writeCharacters(protectEnc(atom->string()));
-        xmlWriter().writeEndElement(); // </tt>
+        writeEndTag(); // </tt>
     }
     else
         writeCharacters(protectEnc(atom->string()));
@@ -3714,11 +3885,12 @@ void DitaXmlGenerator::generateFullName(const Node* apparentNode,
 {
     if (actualNode == 0)
         actualNode = apparentNode;
-    xmlWriter().writeStartElement("xref");
+    writeStartTag(DT_xref);
+    // formathtml
     QString href = linkForNode(actualNode, relative);
     xmlWriter().writeAttribute("href",href);
     writeCharacters(protectEnc(fullName(apparentNode, relative, marker)));
-    xmlWriter().writeEndElement(); // </xref>
+    writeEndTag(); // </xref>
 }
 
 void DitaXmlGenerator::findAllClasses(const InnerNode* node)
@@ -3902,6 +4074,11 @@ void DitaXmlGenerator::findAllNamespaces(const InnerNode* node)
     }
 }
 
+/*!
+  We're writing an attribute that indicates that the text
+  data is a heading, hence, h1, h2, h3... etc, and we must
+  decide which number to use.
+ */
 int DitaXmlGenerator::hOffset(const Node* node)
 {
     switch (node->type()) {
@@ -4142,7 +4319,8 @@ void DitaXmlGenerator::beginLink(const QString& link)
     this->link = link;
     if (link.isEmpty())
         return;
-    xmlWriter().writeStartElement("xref");
+    writeStartTag(DT_xref);
+    // formathtml
     xmlWriter().writeAttribute("href",link);
     inLink = true;
 }
@@ -4152,15 +4330,15 @@ void DitaXmlGenerator::endLink()
     if (inLink) {
         if (link.isEmpty()) {
             if (showBrokenLinks)
-                xmlWriter().writeEndElement(); // </i>
+                writeEndTag(); // </i>
         }
         else {
             if (inObsoleteLink) {
-                xmlWriter().writeStartElement("sup");
+                writeStartTag(DT_sup);
                 xmlWriter().writeCharacters("(obsolete)");
-                xmlWriter().writeEndElement(); // </sup>
+                writeEndTag(); // </sup>
             }
-            xmlWriter().writeEndElement(); // </xref>
+            writeEndTag(); // </xref>
         }
     }
     inLink = false;
@@ -4178,16 +4356,16 @@ void DitaXmlGenerator::generateQmlSummary(const Section& section,
                                           CodeMarker* marker)
 {
     if (!section.members.isEmpty()) {
-        xmlWriter().writeStartElement("ul");
+        writeStartTag(DT_ul);
         NodeList::ConstIterator m;
         m = section.members.begin();
         while (m != section.members.end()) {
-            xmlWriter().writeStartElement("li");
+            writeStartTag(DT_li);
             generateQmlItem(*m,relative,marker,true);
-            xmlWriter().writeEndElement(); // </li>
+            writeEndTag(); // </li>
             ++m;
         }
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </ul>
     }
 }
 
@@ -4205,11 +4383,11 @@ void DitaXmlGenerator::generateDetailedQmlMember(const Node* node,
     if (node->subType() == Node::QmlPropertyGroup) {
         const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(node);
         NodeList::ConstIterator p = qpgn->childNodes().begin();
-        xmlWriter().writeStartElement("ul");
+        writeStartTag(DT_ul);
         while (p != qpgn->childNodes().end()) {
             if ((*p)->type() == Node::QmlProperty) {
                 qpn = static_cast<const QmlPropertyNode*>(*p);
-                xmlWriter().writeStartElement("li");
+                writeStartTag(DT_li);
                 writeGuidAttribute((Node*)qpn);
                 QString attr;
                 if (!qpn->isWritable(myTree))
@@ -4222,31 +4400,31 @@ void DitaXmlGenerator::generateDetailedQmlMember(const Node* node,
                 if (!attr.isEmpty())
                     xmlWriter().writeAttribute("outputclass",attr);
                 generateQmlItem(qpn, relative, marker, false);
-                xmlWriter().writeEndElement(); // </li>
+                writeEndTag(); // </li>
             }
             ++p;
         }
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </ul>
     }
     else if (node->type() == Node::QmlSignal) {
         Node* n = const_cast<Node*>(node);
-        xmlWriter().writeStartElement("ul");
-        xmlWriter().writeStartElement("li");
+        writeStartTag(DT_ul);
+        writeStartTag(DT_li);
         writeGuidAttribute(n);
         marked = getMarkedUpSynopsis(n, relative, marker, CodeMarker::Detailed);
         writeText(marked, marker, relative);
-        xmlWriter().writeEndElement(); // </li>
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </li>
+        writeEndTag(); // </ul>
     }
     else if (node->type() == Node::QmlMethod) {
         Node* n = const_cast<Node*>(node);
-        xmlWriter().writeStartElement("ul");
-        xmlWriter().writeStartElement("li");
+        writeStartTag(DT_ul);
+        writeStartTag(DT_li);
         writeGuidAttribute(n);
         marked = getMarkedUpSynopsis(n, relative, marker, CodeMarker::Detailed);
         writeText(marked, marker, relative);
-        xmlWriter().writeEndElement(); // </li>
-        xmlWriter().writeEndElement(); // </ul>
+        writeEndTag(); // </li>
+        writeEndTag(); // </ul>
     }
     generateStatus(node, marker);
     generateBody(node, marker);
@@ -4270,7 +4448,7 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
             const Node* n = myTree->findNode(strList,Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
-                xmlWriter().writeStartElement("p");
+                writeStartTag(DT_p);
                 xmlWriter().writeAttribute("outputclass","inherits");
                 Text text;
                 text << "[Inherits ";
@@ -4280,7 +4458,7 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
                 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
                 text << "]";
                 generateText(text, cn, marker);
-                xmlWriter().writeEndElement(); // </p>
+                writeEndTag(); // </p>
             }
         }
     }
@@ -4318,7 +4496,7 @@ void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
 {
     const ClassNode* cn = qcn->classNode();
     if (cn && (cn->status() != Node::Internal)) {
-        xmlWriter().writeStartElement("p");
+        writeStartTag(DT_p);
             xmlWriter().writeAttribute("outputclass","instantiates");
         Text text;
         text << "[";
@@ -4333,7 +4511,7 @@ void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
         text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
         text << "]";
         generateText(text, qcn, marker);
-        xmlWriter().writeEndElement(); // </p>
+        writeEndTag(); // </p>
     }
 }
 
@@ -4350,7 +4528,7 @@ void DitaXmlGenerator::generateInstantiatedBy(const ClassNode* cn,
     if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
         const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
         if (n && n->subType() == Node::QmlClass) {
-            xmlWriter().writeStartElement("p");
+            writeStartTag(DT_p);
             xmlWriter().writeAttribute("outputclass","instantiated-by");
             Text text;
             text << "[";
@@ -4365,7 +4543,7 @@ void DitaXmlGenerator::generateInstantiatedBy(const ClassNode* cn,
             text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
             text << "]";
             generateText(text, cn, marker);
-            xmlWriter().writeEndElement(); // </p>
+            writeEndTag(); // </p>
         }
     }
 }
@@ -4421,32 +4599,32 @@ void DitaXmlGenerator::writeDerivations(const ClassNode* cn, CodeMarker* marker)
     int index;
 
     if (!cn->baseClasses().isEmpty()) {
-        xmlWriter().writeStartElement(CXXCLASSDERIVATIONS);
+        writeStartTag(DT_cxxClassDerivations);
         r = cn->baseClasses().begin();
         index = 0;
         while (r != cn->baseClasses().end()) {
-            xmlWriter().writeStartElement(CXXCLASSDERIVATION);
-            xmlWriter().writeStartElement(CXXCLASSDERIVATIONACCESSSPECIFIER);
+            writeStartTag(DT_cxxClassDerivation);
+            writeStartTag(DT_cxxClassDerivationAccessSpecifier);
             xmlWriter().writeAttribute("value",(*r).accessString());
-            xmlWriter().writeEndElement(); // </cxxClassDerivationAccessSpecifier>
+            writeEndTag(); // </cxxClassDerivationAccessSpecifier>
 
             // not included: <cxxClassDerivationVirtual>
 
-            xmlWriter().writeStartElement(CXXCLASSBASECLASS);
+            writeStartTag(DT_cxxClassBaseClass);
             QString attr = fileName((*r).node) + "#" + (*r).node->guid();
             xmlWriter().writeAttribute("href",attr);
             writeCharacters(marker->plainFullName((*r).node));
-            xmlWriter().writeEndElement(); // </cxxClassBaseClass>
+            writeEndTag(); // </cxxClassBaseClass>
 
             // not included: <ClassBaseStruct> or <cxxClassBaseUnion>
 
-            xmlWriter().writeEndElement(); // </cxxClassDerivation>
+            writeEndTag(); // </cxxClassDerivation>
 
             // not included: <cxxStructDerivation>
 
              ++r;
         }
-        xmlWriter().writeEndElement(); // </cxxClassDerivations>
+        writeEndTag(); // </cxxClassDerivations>
      }
 }
 
@@ -4457,73 +4635,77 @@ void DitaXmlGenerator::writeDerivations(const ClassNode* cn, CodeMarker* marker)
  */
 void DitaXmlGenerator::writeLocation(const Node* n)
 {
-    QString s1, s2, s3, s4, s5, s6;
+    DitaTag s1, s2, s3, s4, s5, s6;
+    s1 = DT_cxxClassAPIItemLocation;
+    s2 = DT_cxxClassDeclarationFile;
+    s3 = DT_cxxClassDeclarationFileLine;
+    s4 = DT_LAST;
     if (n->type() == Node::Class || n->type() == Node::Namespace) {
-        s1 = CXXCLASSAPIITEMLOCATION;
-        s2 = CXXCLASSDECLARATIONFILE;
-        s3 = CXXCLASSDECLARATIONFILELINE;
+        s1 = DT_cxxClassAPIItemLocation;
+        s2 = DT_cxxClassDeclarationFile;
+        s3 = DT_cxxClassDeclarationFileLine;
     }
     else if (n->type() == Node::Function) {
         FunctionNode* fn = const_cast<FunctionNode*>(static_cast<const FunctionNode*>(n));
         if (fn->isMacro()) {
-            s1 = CXXDEFINEAPIITEMLOCATION;
-            s2 = CXXDEFINEDECLARATIONFILE;
-            s3 = CXXDEFINEDECLARATIONFILELINE;
+            s1 = DT_cxxDefineAPIItemLocation;
+            s2 = DT_cxxDefineDeclarationFile;
+            s3 = DT_cxxDefineDeclarationFileLine;
         }
         else {
-            s1 = CXXFUNCTIONAPIITEMLOCATION;
-            s2 = CXXFUNCTIONDECLARATIONFILE;
-            s3 = CXXFUNCTIONDECLARATIONFILELINE;
+            s1 = DT_cxxFunctionAPIItemLocation;
+            s2 = DT_cxxFunctionDeclarationFile;
+            s3 = DT_cxxFunctionDeclarationFileLine;
         }
     }
     else if (n->type() == Node::Enum) {
-        s1 = CXXENUMERATIONAPIITEMLOCATION;
-        s2 = CXXENUMERATIONDECLARATIONFILE;
-        s3 = CXXENUMERATIONDECLARATIONFILELINE;
-        s4 = CXXENUMERATIONDEFINITIONFILE;
-        s5 = CXXENUMERATIONDEFINITIONFILELINESTART;
-        s6 = CXXENUMERATIONDEFINITIONFILELINEEND;
+        s1 = DT_cxxEnumerationAPIItemLocation;
+        s2 = DT_cxxEnumerationDeclarationFile;
+        s3 = DT_cxxEnumerationDeclarationFileLine;
+        s4 = DT_cxxEnumerationDefinitionFile;
+        s5 = DT_cxxEnumerationDefinitionFileLineStart;
+        s6 = DT_cxxEnumerationDefinitionFileLineEnd;
     }
     else if (n->type() == Node::Typedef) {
-        s1 = CXXTYPEDEFAPIITEMLOCATION;
-        s2 = CXXTYPEDEFDECLARATIONFILE;
-        s3 = CXXTYPEDEFDECLARATIONFILELINE;
+        s1 = DT_cxxTypedefAPIItemLocation;
+        s2 = DT_cxxTypedefDeclarationFile;
+        s3 = DT_cxxTypedefDeclarationFileLine;
     }
     else if ((n->type() == Node::Property) ||
              (n->type() == Node::Variable)) {
-        s1 = CXXVARIABLEAPIITEMLOCATION;
-        s2 = CXXVARIABLEDECLARATIONFILE;
-        s3 = CXXVARIABLEDECLARATIONFILELINE;
+        s1 = DT_cxxVariableAPIItemLocation;
+        s2 = DT_cxxVariableDeclarationFile;
+        s3 = DT_cxxVariableDeclarationFileLine;
     }
-    xmlWriter().writeStartElement(s1);
-    xmlWriter().writeStartElement(s2);
+    writeStartTag(s1);
+    writeStartTag(s2);
     xmlWriter().writeAttribute("name","filePath");
     xmlWriter().writeAttribute("value",n->location().filePath());
-    xmlWriter().writeEndElement(); // </cxx<s2>DeclarationFile>
-    xmlWriter().writeStartElement(s3);
+    writeEndTag(); // </cxx<s2>DeclarationFile>
+    writeStartTag(s3);
     xmlWriter().writeAttribute("name","lineNumber");
     QString lineNr;
     xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
-    xmlWriter().writeEndElement(); // </cxx<s3>DeclarationFileLine>
-    if (!s4.isEmpty()) { // zzz This stuff is temporary, I think.
-        xmlWriter().writeStartElement(s4);
+    writeEndTag(); // </cxx<s3>DeclarationFileLine>
+    if (s4 != DT_LAST) { // zzz This stuff is temporary, I think.
+        writeStartTag(s4);
         xmlWriter().writeAttribute("name","filePath");
         xmlWriter().writeAttribute("value",n->location().filePath());
-        xmlWriter().writeEndElement(); // </cxx<s4>DefinitionFile>
-        xmlWriter().writeStartElement(s5);
+        writeEndTag(); // </cxx<s4>DefinitionFile>
+        writeStartTag(s5);
         xmlWriter().writeAttribute("name","lineNumber");
         xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
-        xmlWriter().writeEndElement(); // </cxx<s5>DefinitionFileLineStart>
-        xmlWriter().writeStartElement(s6);
+        writeEndTag(); // </cxx<s5>DefinitionFileLineStart>
+        writeStartTag(s6);
         xmlWriter().writeAttribute("name","lineNumber");
         xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
-        xmlWriter().writeEndElement(); // </cxx<s6>DefinitionFileLineEnd>
+        writeEndTag(); // </cxx<s6>DefinitionFileLineEnd>
     }
 
     // not included: <cxxXXXDefinitionFile>, <cxxXXXDefinitionFileLineStart>,
     //               and <cxxXXXDefinitionFileLineEnd>
 
-    xmlWriter().writeEndElement(); // </cxx<s1>ApiItemLocation>
+    writeEndTag(); // </cxx<s1>ApiItemLocation>
 }
 
 /*!
@@ -4538,90 +4720,90 @@ void DitaXmlGenerator::writeFunctions(const Section& s,
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Function) {
             FunctionNode* fn = const_cast<FunctionNode*>(static_cast<const FunctionNode*>(*m));
-            xmlWriter().writeStartElement(CXXFUNCTION);
+            writeStartTag(DT_cxxFunction);
             xmlWriter().writeAttribute("id",fn->guid());
             if (!attribute.isEmpty())
                 xmlWriter().writeAttribute("outputclass",attribute);
-            xmlWriter().writeStartElement("apiName");
+            writeStartTag(DT_apiName);
             if (fn->metaness() == FunctionNode::Signal)
                 xmlWriter().writeAttribute("class","signal");
             else if (fn->metaness() == FunctionNode::Slot)
                 xmlWriter().writeAttribute("class","slot");
             writeCharacters(fn->name());
-            xmlWriter().writeEndElement(); // </apiName>
+            writeEndTag(); // </apiName>
             generateBrief(fn,marker);
 
             // not included: <prolog>
 
-            xmlWriter().writeStartElement(CXXFUNCTIONDETAIL);
-            xmlWriter().writeStartElement(CXXFUNCTIONDEFINITION);
-            xmlWriter().writeStartElement(CXXFUNCTIONACCESSSPECIFIER);
+            writeStartTag(DT_cxxFunctionDetail);
+            writeStartTag(DT_cxxFunctionDefinition);
+            writeStartTag(DT_cxxFunctionAccessSpecifier);
             xmlWriter().writeAttribute("value",fn->accessString());
-            xmlWriter().writeEndElement(); // <cxxFunctionAccessSpecifier>
+            writeEndTag(); // <cxxFunctionAccessSpecifier>
 
             // not included: <cxxFunctionStorageClassSpecifierExtern>
 
             if (fn->isStatic()) {
-                xmlWriter().writeStartElement(CXXFUNCTIONSTORAGECLASSSPECIFIERSTATIC);
+                writeStartTag(DT_cxxFunctionStorageClassSpecifierStatic);
                 xmlWriter().writeAttribute("name","static");
                 xmlWriter().writeAttribute("value","static");
-                xmlWriter().writeEndElement(); // <cxxFunctionStorageClassSpecifierStatic>
+                writeEndTag(); // <cxxFunctionStorageClassSpecifierStatic>
             }
 
             // not included: <cxxFunctionStorageClassSpecifierMutable>,
 
             if (fn->isConst()) {
-                xmlWriter().writeStartElement(CXXFUNCTIONCONST);
+                writeStartTag(DT_cxxFunctionConst);
                 xmlWriter().writeAttribute("name","const");
                 xmlWriter().writeAttribute("value","const");
-                xmlWriter().writeEndElement(); // <cxxFunctionConst>
+                writeEndTag(); // <cxxFunctionConst>
             }
             
             // not included: <cxxFunctionExplicit>
             //               <cxxFunctionInline
 
             if (fn->virtualness() != FunctionNode::NonVirtual) {
-                xmlWriter().writeStartElement(CXXFUNCTIONVIRTUAL);
+                writeStartTag(DT_cxxFunctionVirtual);
                 xmlWriter().writeAttribute("name","virtual");
                 xmlWriter().writeAttribute("value","virtual");
-                xmlWriter().writeEndElement(); // <cxxFunctionVirtual>
+                writeEndTag(); // <cxxFunctionVirtual>
                 if (fn->virtualness() == FunctionNode::PureVirtual) {
-                    xmlWriter().writeStartElement(CXXFUNCTIONPUREVIRTUAL);
+                    writeStartTag(DT_cxxFunctionPureVirtual);
                     xmlWriter().writeAttribute("name","pure virtual");
                     xmlWriter().writeAttribute("value","pure virtual");
-                    xmlWriter().writeEndElement(); // <cxxFunctionPureVirtual>
+                    writeEndTag(); // <cxxFunctionPureVirtual>
                 }
             }
             
             if (fn->name() == n->name()) {
-                xmlWriter().writeStartElement(CXXFUNCTIONCONSTRUCTOR);
+                writeStartTag(DT_cxxFunctionConstructor);
                 xmlWriter().writeAttribute("name","constructor");
                 xmlWriter().writeAttribute("value","constructor");
-                xmlWriter().writeEndElement(); // <cxxFunctionConstructor>
+                writeEndTag(); // <cxxFunctionConstructor>
             }
             else if (fn->name()[0] == QChar('~')) {
-                xmlWriter().writeStartElement(CXXFUNCTIONDESTRUCTOR);
+                writeStartTag(DT_cxxFunctionDestructor);
                 xmlWriter().writeAttribute("name","destructor");
                 xmlWriter().writeAttribute("value","destructor");
-                xmlWriter().writeEndElement(); // <cxxFunctionDestructor>
+                writeEndTag(); // <cxxFunctionDestructor>
             }
             else {
-                xmlWriter().writeStartElement(CXXFUNCTIONDECLAREDTYPE);
+                writeStartTag(DT_cxxFunctionDeclaredType);
                 writeCharacters(fn->returnType());
-                xmlWriter().writeEndElement(); // <cxxFunctionDeclaredType>
+                writeEndTag(); // <cxxFunctionDeclaredType>
             }
 
             // not included: <cxxFunctionReturnType>
 
             QString fq = fullQualification(fn);
             if (!fq.isEmpty()) {
-                xmlWriter().writeStartElement(CXXFUNCTIONSCOPEDNAME);
+                writeStartTag(DT_cxxFunctionScopedName);
                 writeCharacters(fq);
-                xmlWriter().writeEndElement(); // <cxxFunctionScopedName>
+                writeEndTag(); // <cxxFunctionScopedName>
             }
-            xmlWriter().writeStartElement(CXXFUNCTIONPROTOTYPE);
+            writeStartTag(DT_cxxFunctionPrototype);
             writeCharacters(fn->signature(true));
-            xmlWriter().writeEndElement(); // <cxxFunctionPrototype>
+            writeEndTag(); // <cxxFunctionPrototype>
 
             QString fnl = fn->signature(false);
             int idx = fnl.indexOf(' ');
@@ -4630,30 +4812,30 @@ void DitaXmlGenerator::writeFunctions(const Section& s,
             else
                 ++idx;
             fnl = fn->parent()->name() + "::" + fnl.mid(idx);
-            xmlWriter().writeStartElement(CXXFUNCTIONNAMELOOKUP);
+            writeStartTag(DT_cxxFunctionNameLookup);
             writeCharacters(fnl);
-            xmlWriter().writeEndElement(); // <cxxFunctionNameLookup>
+            writeEndTag(); // <cxxFunctionNameLookup>
 
             if (!fn->isInternal() && fn->isReimp() && fn->reimplementedFrom() != 0) {
                 FunctionNode* rfn = (FunctionNode*)fn->reimplementedFrom();
                 if (rfn && !rfn->isInternal()) {
-                    xmlWriter().writeStartElement(CXXFUNCTIONREIMPLEMENTED);
+                    writeStartTag(DT_cxxFunctionReimplemented);
                     xmlWriter().writeAttribute("href",rfn->ditaXmlHref());
                     writeCharacters(marker->plainFullName(rfn));
-                    xmlWriter().writeEndElement(); // </cxxFunctionReimplemented>
+                    writeEndTag(); // </cxxFunctionReimplemented>
                 }
             }
             writeParameters(fn);
             writeLocation(fn);
-            xmlWriter().writeEndElement(); // <cxxFunctionDefinition>
+            writeEndTag(); // <cxxFunctionDefinition>
 
-            writeDetailedDescription(fn, marker, true, QString());
+            writeApiDesc(fn, marker, QString());
             // generateAlsoList(inner, marker);
 
             // not included: <example> or <apiImpl>
 
-            xmlWriter().writeEndElement(); // </cxxFunctionDetail>
-            xmlWriter().writeEndElement(); // </cxxFunction>
+            writeEndTag(); // </cxxFunctionDetail>
+            writeEndTag(); // </cxxFunction>
 
             if (fn->metaness() == FunctionNode::Ctor ||
                 fn->metaness() == FunctionNode::Dtor ||
@@ -4671,33 +4853,33 @@ void DitaXmlGenerator::writeParameters(const FunctionNode* fn)
 {
     const QList<Parameter>& parameters = fn->parameters();
     if (!parameters.isEmpty()) {
-        xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERS);
+        writeStartTag(DT_cxxFunctionParameters);
         QList<Parameter>::ConstIterator p = parameters.begin();
         while (p != parameters.end()) {
-            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETER);
-            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDECLAREDTYPE);
+            writeStartTag(DT_cxxFunctionParameter);
+            writeStartTag(DT_cxxFunctionParameterDeclaredType);
             writeCharacters((*p).leftType());
             if (!(*p).rightType().isEmpty())
                 writeCharacters((*p).rightType());
-            xmlWriter().writeEndElement(); // <cxxFunctionParameterDeclaredType>
-            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDECLARATIONNAME);
+            writeEndTag(); // <cxxFunctionParameterDeclaredType>
+            writeStartTag(DT_cxxFunctionParameterDeclarationName);
             writeCharacters((*p).name());
-            xmlWriter().writeEndElement(); // <cxxFunctionParameterDeclarationName>
+            writeEndTag(); // <cxxFunctionParameterDeclarationName>
 
             // not included: <cxxFunctionParameterDefinitionName>
 
             if (!(*p).defaultValue().isEmpty()) {
-                xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDEFAULTVALUE);
+                writeStartTag(DT_cxxFunctionParameterDefaultValue);
                 writeCharacters((*p).defaultValue());
-                xmlWriter().writeEndElement(); // <cxxFunctionParameterDefaultValue>
+                writeEndTag(); // <cxxFunctionParameterDefaultValue>
             }
 
             // not included: <apiDefNote>
 
-            xmlWriter().writeEndElement(); // <cxxFunctionParameter>
+            writeEndTag(); // <cxxFunctionParameter>
             ++p;
         }
-        xmlWriter().writeEndElement(); // <cxxFunctionParameters>
+        writeEndTag(); // <cxxFunctionParameters>
     }
 }
 
@@ -4712,32 +4894,32 @@ void DitaXmlGenerator::writeEnumerations(const Section& s,
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Enum) {
             const EnumNode* en = static_cast<const EnumNode*>(*m);
-            xmlWriter().writeStartElement(CXXENUMERATION);
+            writeStartTag(DT_cxxEnumeration);
             xmlWriter().writeAttribute("id",en->guid());
             if (!attribute.isEmpty())
                 xmlWriter().writeAttribute("outputclass",attribute);
-            xmlWriter().writeStartElement("apiName");
+            writeStartTag(DT_apiName);
             writeCharacters(en->name());
-            xmlWriter().writeEndElement(); // </apiName>
+            writeEndTag(); // </apiName>
             generateBrief(en,marker);
 
             // not included <prolog>
 
-            xmlWriter().writeStartElement(CXXENUMERATIONDETAIL);
-            xmlWriter().writeStartElement(CXXENUMERATIONDEFINITION);
-            xmlWriter().writeStartElement(CXXENUMERATIONACCESSSPECIFIER);
+            writeStartTag(DT_cxxEnumerationDetail);
+            writeStartTag(DT_cxxEnumerationDefinition);
+            writeStartTag(DT_cxxEnumerationAccessSpecifier);
             xmlWriter().writeAttribute("value",en->accessString());
-            xmlWriter().writeEndElement(); // <cxxEnumerationAccessSpecifier>
+            writeEndTag(); // <cxxEnumerationAccessSpecifier>
 
             QString fq = fullQualification(en);
             if (!fq.isEmpty()) {
-                xmlWriter().writeStartElement(CXXENUMERATIONSCOPEDNAME);
+                writeStartTag(DT_cxxEnumerationScopedName);
                 writeCharacters(fq);
-                xmlWriter().writeEndElement(); // <cxxEnumerationScopedName>
+                writeEndTag(); // <cxxEnumerationScopedName>
             }
             const QList<EnumItem>& items = en->items();
             if (!items.isEmpty()) {
-                xmlWriter().writeStartElement(CXXENUMERATIONPROTOTYPE);
+                writeStartTag(DT_cxxEnumerationPrototype);
                 writeCharacters(en->name());
                 xmlWriter().writeCharacters(" = { ");
                 QList<EnumItem>::ConstIterator i = items.begin();
@@ -4752,68 +4934,68 @@ void DitaXmlGenerator::writeEnumerations(const Section& s,
                         xmlWriter().writeCharacters(", ");
                 }
                 xmlWriter().writeCharacters(" }");
-                xmlWriter().writeEndElement(); // <cxxEnumerationPrototype>
+                writeEndTag(); // <cxxEnumerationPrototype>
             }
 
-            xmlWriter().writeStartElement(CXXENUMERATIONNAMELOOKUP);
+            writeStartTag(DT_cxxEnumerationNameLookup);
             writeCharacters(en->parent()->name() + "::" + en->name());
-            xmlWriter().writeEndElement(); // <cxxEnumerationNameLookup>
+            writeEndTag(); // <cxxEnumerationNameLookup>
 
             // not included: <cxxEnumerationReimplemented>
 
             if (!items.isEmpty()) {
-                xmlWriter().writeStartElement(CXXENUMERATORS);
+                writeStartTag(DT_cxxEnumerators);
                 QList<EnumItem>::ConstIterator i = items.begin();
                 while (i != items.end()) {
-                    xmlWriter().writeStartElement(CXXENUMERATOR);
-                    xmlWriter().writeStartElement("apiName");
+                    writeStartTag(DT_cxxEnumerator);
+                    writeStartTag(DT_apiName);
                     writeCharacters((*i).name());
-                    xmlWriter().writeEndElement(); // </apiName>
+                    writeEndTag(); // </apiName>
 
                     QString fq = fullQualification(en->parent());
                     if (!fq.isEmpty()) {
-                        xmlWriter().writeStartElement(CXXENUMERATORSCOPEDNAME);
+                        writeStartTag(DT_cxxEnumeratorScopedName);
                         writeCharacters(fq + "::" + (*i).name());
-                        xmlWriter().writeEndElement(); // <cxxEnumeratorScopedName>
+                        writeEndTag(); // <cxxEnumeratorScopedName>
                     }
-                    xmlWriter().writeStartElement(CXXENUMERATORPROTOTYPE);
+                    writeStartTag(DT_cxxEnumeratorPrototype);
                     writeCharacters((*i).name());
-                    xmlWriter().writeEndElement(); // <cxxEnumeratorPrototype>
-                    xmlWriter().writeStartElement(CXXENUMERATORNAMELOOKUP);
+                    writeEndTag(); // <cxxEnumeratorPrototype>
+                    writeStartTag(DT_cxxEnumeratorNameLookup);
                     writeCharacters(en->parent()->name() + "::" + (*i).name());
-                    xmlWriter().writeEndElement(); // <cxxEnumeratorNameLookup>
+                    writeEndTag(); // <cxxEnumeratorNameLookup>
 
                     if (!(*i).value().isEmpty()) {
-                        xmlWriter().writeStartElement(CXXENUMERATORINITIALISER);
+                        writeStartTag(DT_cxxEnumeratorInitialiser);
                         xmlWriter().writeAttribute("value", (*i).value());
-                        xmlWriter().writeEndElement(); // <cxxEnumeratorInitialiser>
+                        writeEndTag(); // <cxxEnumeratorInitialiser>
                     }
 
                     // not included: <cxxEnumeratorAPIItemLocation>
 
                     if (!(*i).text().isEmpty()) {
-                        xmlWriter().writeStartElement("apiDesc");
+                        writeStartTag(DT_apiDesc);
                         generateText((*i).text(), en, marker);
-                        xmlWriter().writeEndElement(); // </apiDesc>
+                        writeEndTag(); // </apiDesc>
                     }
-                    xmlWriter().writeEndElement(); // <cxxEnumerator>
+                    writeEndTag(); // <cxxEnumerator>
                     ++i;
                 }
-                xmlWriter().writeEndElement(); // <cxxEnumerators>
+                writeEndTag(); // <cxxEnumerators>
             }
             
             writeLocation(en);
-            xmlWriter().writeEndElement(); // <cxxEnumerationDefinition>
+            writeEndTag(); // <cxxEnumerationDefinition>
 
-            writeDetailedDescription(en, marker, true, QString());
+            writeApiDesc(en, marker, QString());
 
             // not included: <example> or <apiImpl>
 
-            xmlWriter().writeEndElement(); // </cxxEnumerationDetail>
+            writeEndTag(); // </cxxEnumerationDetail>
 
             // not included: <related-links>
 
-            xmlWriter().writeEndElement(); // </cxxEnumeration>
+            writeEndTag(); // </cxxEnumeration>
         }
         ++m;
     }
@@ -4831,52 +5013,52 @@ void DitaXmlGenerator::writeTypedefs(const Section& s,
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Typedef) {
             const TypedefNode* tn = static_cast<const TypedefNode*>(*m);
-            xmlWriter().writeStartElement(CXXTYPEDEF);
+            writeStartTag(DT_cxxTypedef);
             xmlWriter().writeAttribute("id",tn->guid());
             if (!attribute.isEmpty())
                 xmlWriter().writeAttribute("outputclass",attribute);
-            xmlWriter().writeStartElement("apiName");
+            writeStartTag(DT_apiName);
             writeCharacters(tn->name());
-            xmlWriter().writeEndElement(); // </apiName>
+            writeEndTag(); // </apiName>
             generateBrief(tn,marker);
 
             // not included: <prolog>
 
-            xmlWriter().writeStartElement(CXXTYPEDEFDETAIL);
-            xmlWriter().writeStartElement(CXXTYPEDEFDEFINITION);
-            xmlWriter().writeStartElement(CXXTYPEDEFACCESSSPECIFIER);
+            writeStartTag(DT_cxxTypedefDetail);
+            writeStartTag(DT_cxxTypedefDefinition);
+            writeStartTag(DT_cxxTypedefAccessSpecifier);
             xmlWriter().writeAttribute("value",tn->accessString());
-            xmlWriter().writeEndElement(); // <cxxTypedefAccessSpecifier>
+            writeEndTag(); // <cxxTypedefAccessSpecifier>
 
             // not included: <cxxTypedefDeclaredType>
 
             QString fq = fullQualification(tn);
             if (!fq.isEmpty()) {
-                xmlWriter().writeStartElement(CXXTYPEDEFSCOPEDNAME);
+                writeStartTag(DT_cxxTypedefScopedName);
                 writeCharacters(fq);
-                xmlWriter().writeEndElement(); // <cxxTypedefScopedName>
+                writeEndTag(); // <cxxTypedefScopedName>
             }
 
             // not included: <cxxTypedefPrototype>
 
-            xmlWriter().writeStartElement(CXXTYPEDEFNAMELOOKUP);
+            writeStartTag(DT_cxxTypedefNameLookup);
             writeCharacters(tn->parent()->name() + "::" + tn->name());
-            xmlWriter().writeEndElement(); // <cxxTypedefNameLookup>
+            writeEndTag(); // <cxxTypedefNameLookup>
 
             // not included: <cxxTypedefReimplemented>
 
             writeLocation(tn);
-            xmlWriter().writeEndElement(); // <cxxTypedefDefinition>
+            writeEndTag(); // <cxxTypedefDefinition>
 
-            writeDetailedDescription(tn, marker, true, QString());
+            writeApiDesc(tn, marker, QString());
 
             // not included: <example> or <apiImpl>
 
-            xmlWriter().writeEndElement(); // </cxxTypedefDetail>
+            writeEndTag(); // </cxxTypedefDetail>
 
             // not included: <related-links>
 
-            xmlWriter().writeEndElement(); // </cxxTypedef>
+            writeEndTag(); // </cxxTypedef>
         }
         ++m;
     }
@@ -4894,22 +5076,22 @@ void DitaXmlGenerator::writeProperties(const Section& s,
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Property) {
             const PropertyNode* pn = static_cast<const PropertyNode*>(*m);
-            xmlWriter().writeStartElement(CXXVARIABLE);
+            writeStartTag(DT_cxxVariable);
             xmlWriter().writeAttribute("id",pn->guid());
             if (!attribute.isEmpty())
                 xmlWriter().writeAttribute("outputclass",attribute);
-            xmlWriter().writeStartElement("apiName");
+            writeStartTag(DT_apiName);
             writeCharacters(pn->name());
-            xmlWriter().writeEndElement(); // </apiName>
+            writeEndTag(); // </apiName>
             generateBrief(pn,marker);
 
             // not included: <prolog>
 
-            xmlWriter().writeStartElement(CXXVARIABLEDETAIL);
-            xmlWriter().writeStartElement(CXXVARIABLEDEFINITION);
-            xmlWriter().writeStartElement(CXXVARIABLEACCESSSPECIFIER);
+            writeStartTag(DT_cxxVariableDetail);
+            writeStartTag(DT_cxxVariableDefinition);
+            writeStartTag(DT_cxxVariableAccessSpecifier);
             xmlWriter().writeAttribute("value",pn->accessString());
-            xmlWriter().writeEndElement(); // <cxxVariableAccessSpecifier>
+            writeEndTag(); // <cxxVariableAccessSpecifier>
 
             // not included: <cxxVariableStorageClassSpecifierExtern>,
             //               <cxxVariableStorageClassSpecifierStatic>,
@@ -4917,18 +5099,18 @@ void DitaXmlGenerator::writeProperties(const Section& s,
             //               <cxxVariableConst>, <cxxVariableVolatile>
 
             if (!pn->qualifiedDataType().isEmpty()) {
-                xmlWriter().writeStartElement(CXXVARIABLEDECLAREDTYPE);
+                writeStartTag(DT_cxxVariableDeclaredType);
                 writeCharacters(pn->qualifiedDataType());
-                xmlWriter().writeEndElement(); // <cxxVariableDeclaredType>
+                writeEndTag(); // <cxxVariableDeclaredType>
             }
             QString fq = fullQualification(pn);
             if (!fq.isEmpty()) {
-                xmlWriter().writeStartElement(CXXVARIABLESCOPEDNAME);
+                writeStartTag(DT_cxxVariableScopedName);
                 writeCharacters(fq);
-                xmlWriter().writeEndElement(); // <cxxVariableScopedName>
+                writeEndTag(); // <cxxVariableScopedName>
             }
             
-            xmlWriter().writeStartElement(CXXVARIABLEPROTOTYPE);
+            writeStartTag(DT_cxxVariablePrototype);
             xmlWriter().writeCharacters("Q_PROPERTY(");
             writeCharacters(pn->qualifiedDataType());
             xmlWriter().writeCharacters(" ");
@@ -4964,32 +5146,32 @@ void DitaXmlGenerator::writeProperties(const Section& s,
             if (pn->isFinal())
                 xmlWriter().writeCharacters(" FINAL");
             xmlWriter().writeCharacters(")");
-            xmlWriter().writeEndElement(); // <cxxVariablePrototype>
+            writeEndTag(); // <cxxVariablePrototype>
 
-            xmlWriter().writeStartElement(CXXVARIABLENAMELOOKUP);
+            writeStartTag(DT_cxxVariableNameLookup);
             writeCharacters(pn->parent()->name() + "::" + pn->name());
-            xmlWriter().writeEndElement(); // <cxxVariableNameLookup>
+            writeEndTag(); // <cxxVariableNameLookup>
 
             if (pn->overriddenFrom() != 0) {
                 PropertyNode* opn = (PropertyNode*)pn->overriddenFrom();
-                xmlWriter().writeStartElement(CXXVARIABLEREIMPLEMENTED);
+                writeStartTag(DT_cxxVariableReimplemented);
                 xmlWriter().writeAttribute("href",opn->ditaXmlHref());
                 writeCharacters(marker->plainFullName(opn));
-                xmlWriter().writeEndElement(); // </cxxVariableReimplemented>
+                writeEndTag(); // </cxxVariableReimplemented>
             }
 
             writeLocation(pn);
-            xmlWriter().writeEndElement(); // <cxxVariableDefinition>
+            writeEndTag(); // <cxxVariableDefinition>
 
-            writeDetailedDescription(pn, marker, true, QString());
+            writeApiDesc(pn, marker, QString());
             
             // not included: <example> or <apiImpl>
 
-            xmlWriter().writeEndElement(); // </cxxVariableDetail>
+            writeEndTag(); // </cxxVariableDetail>
 
             // not included: <related-links>
 
-            xmlWriter().writeEndElement(); // </cxxVariable>
+            writeEndTag(); // </cxxVariable>
         }
         ++m;
     }
@@ -5006,74 +5188,74 @@ void DitaXmlGenerator::writeDataMembers(const Section& s,
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Variable) {
             const VariableNode* vn = static_cast<const VariableNode*>(*m);
-            xmlWriter().writeStartElement(CXXVARIABLE);
+            writeStartTag(DT_cxxVariable);
             xmlWriter().writeAttribute("id",vn->guid());
             if (!attribute.isEmpty())
                 xmlWriter().writeAttribute("outputclass",attribute);
-            xmlWriter().writeStartElement("apiName");
+            writeStartTag(DT_apiName);
             writeCharacters(vn->name());
-            xmlWriter().writeEndElement(); // </apiName>
+            writeEndTag(); // </apiName>
             generateBrief(vn,marker);
 
             // not included: <prolog>
 
-            xmlWriter().writeStartElement(CXXVARIABLEDETAIL);
-            xmlWriter().writeStartElement(CXXVARIABLEDEFINITION);
-            xmlWriter().writeStartElement(CXXVARIABLEACCESSSPECIFIER);
+            writeStartTag(DT_cxxVariableDetail);
+            writeStartTag(DT_cxxVariableDefinition);
+            writeStartTag(DT_cxxVariableAccessSpecifier);
             xmlWriter().writeAttribute("value",vn->accessString());
-            xmlWriter().writeEndElement(); // <cxxVariableAccessSpecifier>
+            writeEndTag(); // <cxxVariableAccessSpecifier>
 
             // not included: <cxxVAriableStorageClassSpecifierExtern>
 
             if (vn->isStatic()) {
-                xmlWriter().writeStartElement(CXXVARIABLESTORAGECLASSSPECIFIERSTATIC);
+                writeStartTag(DT_cxxVariableStorageClassSpecifierStatic);
                 xmlWriter().writeAttribute("name","static");
                 xmlWriter().writeAttribute("value","static");
-                xmlWriter().writeEndElement(); // <cxxVariableStorageClassSpecifierStatic>
+                writeEndTag(); // <cxxVariableStorageClassSpecifierStatic>
             }
 
             // not included: <cxxVAriableStorageClassSpecifierMutable>,
             //               <cxxVariableConst>, <cxxVariableVolatile>
 
-            xmlWriter().writeStartElement(CXXVARIABLEDECLAREDTYPE);
+            writeStartTag(DT_cxxVariableDeclaredType);
             writeCharacters(vn->leftType());
             if (!vn->rightType().isEmpty())
                 writeCharacters(vn->rightType());
-            xmlWriter().writeEndElement(); // <cxxVariableDeclaredType>
+            writeEndTag(); // <cxxVariableDeclaredType>
 
             QString fq = fullQualification(vn);
             if (!fq.isEmpty()) {
-                xmlWriter().writeStartElement(CXXVARIABLESCOPEDNAME);
+                writeStartTag(DT_cxxVariableScopedName);
                 writeCharacters(fq);
-                xmlWriter().writeEndElement(); // <cxxVariableScopedName>
+                writeEndTag(); // <cxxVariableScopedName>
             }
             
-            xmlWriter().writeStartElement(CXXVARIABLEPROTOTYPE);
+            writeStartTag(DT_cxxVariablePrototype);
             writeCharacters(vn->leftType() + " ");
             //writeCharacters(vn->parent()->name() + "::" + vn->name()); 
             writeCharacters(vn->name()); 
             if (!vn->rightType().isEmpty())
                 writeCharacters(vn->rightType());
-            xmlWriter().writeEndElement(); // <cxxVariablePrototype>
+            writeEndTag(); // <cxxVariablePrototype>
 
-            xmlWriter().writeStartElement(CXXVARIABLENAMELOOKUP);
+            writeStartTag(DT_cxxVariableNameLookup);
             writeCharacters(vn->parent()->name() + "::" + vn->name());
-            xmlWriter().writeEndElement(); // <cxxVariableNameLookup>
+            writeEndTag(); // <cxxVariableNameLookup>
 
             // not included: <cxxVariableReimplemented>
 
             writeLocation(vn);
-            xmlWriter().writeEndElement(); // <cxxVariableDefinition>
+            writeEndTag(); // <cxxVariableDefinition>
 
-            writeDetailedDescription(vn, marker, true, QString());
+            writeApiDesc(vn, marker, QString());
 
             // not included: <example> or <apiImpl>
 
-            xmlWriter().writeEndElement(); // </cxxVariableDetail>
+            writeEndTag(); // </cxxVariableDetail>
 
             // not included: <related-links>
 
-            xmlWriter().writeEndElement(); // </cxxVariable>
+            writeEndTag(); // </cxxVariable>
         }
         ++m;
     }
@@ -5091,24 +5273,24 @@ void DitaXmlGenerator::writeMacros(const Section& s,
         if ((*m)->type() == Node::Function) {
             const FunctionNode* fn = static_cast<const FunctionNode*>(*m);
             if (fn->isMacro()) {
-                xmlWriter().writeStartElement(CXXDEFINE);
+                writeStartTag(DT_cxxDefine);
                 xmlWriter().writeAttribute("id",fn->guid());
                 if (!attribute.isEmpty())
                     xmlWriter().writeAttribute("outputclass",attribute);
-                xmlWriter().writeStartElement("apiName");
+                writeStartTag(DT_apiName);
                 writeCharacters(fn->name());
-                xmlWriter().writeEndElement(); // </apiName>
+                writeEndTag(); // </apiName>
                 generateBrief(fn,marker);
 
                 // not included: <prolog>
 
-                xmlWriter().writeStartElement(CXXDEFINEDETAIL);
-                xmlWriter().writeStartElement(CXXDEFINEDEFINITION);
-                xmlWriter().writeStartElement(CXXDEFINEACCESSSPECIFIER);
+                writeStartTag(DT_cxxDefineDetail);
+                writeStartTag(DT_cxxDefineDefinition);
+                writeStartTag(DT_cxxDefineAccessSpecifier);
                 xmlWriter().writeAttribute("value",fn->accessString());
-                xmlWriter().writeEndElement(); // <cxxDefineAccessSpecifier>
+                writeEndTag(); // <cxxDefineAccessSpecifier>
             
-                xmlWriter().writeStartElement(CXXDEFINEPROTOTYPE);
+                writeStartTag(DT_cxxDefinePrototype);
                 xmlWriter().writeCharacters("#define ");
                 writeCharacters(fn->name());
                 if (fn->metaness() == FunctionNode::MacroWithParams) {
@@ -5126,50 +5308,50 @@ void DitaXmlGenerator::writeMacros(const Section& s,
                         xmlWriter().writeCharacters(")");
                     }
                 }
-                xmlWriter().writeEndElement(); // <cxxDefinePrototype>
+                writeEndTag(); // <cxxDefinePrototype>
 
-                xmlWriter().writeStartElement(CXXDEFINENAMELOOKUP);
+                writeStartTag(DT_cxxDefineNameLookup);
                 writeCharacters(fn->name());
-                xmlWriter().writeEndElement(); // <cxxDefineNameLookup>
+                writeEndTag(); // <cxxDefineNameLookup>
 
                 if (fn->reimplementedFrom() != 0) {
                     FunctionNode* rfn = (FunctionNode*)fn->reimplementedFrom();
-                    xmlWriter().writeStartElement(CXXDEFINEREIMPLEMENTED);
+                    writeStartTag(DT_cxxDefineReimplemented);
                     xmlWriter().writeAttribute("href",rfn->ditaXmlHref());
                     writeCharacters(marker->plainFullName(rfn));
-                    xmlWriter().writeEndElement(); // </cxxDefineReimplemented>
+                    writeEndTag(); // </cxxDefineReimplemented>
                 }
 
                 if (fn->metaness() == FunctionNode::MacroWithParams) {
                     QStringList params = fn->parameterNames();
                     if (!params.isEmpty()) {
-                        xmlWriter().writeStartElement(CXXDEFINEPARAMETERS);
+                        writeStartTag(DT_cxxDefineParameters);
                         for (int i = 0; i < params.size(); ++i) {
-                            xmlWriter().writeStartElement(CXXDEFINEPARAMETER);
-                            xmlWriter().writeStartElement(CXXDEFINEPARAMETERDECLARATIONNAME);
+                            writeStartTag(DT_cxxDefineParameter);
+                            writeStartTag(DT_cxxDefineParameterDeclarationName);
                             writeCharacters(params[i]);
-                            xmlWriter().writeEndElement(); // <cxxDefineParameterDeclarationName>
+                            writeEndTag(); // <cxxDefineParameterDeclarationName>
 
                             // not included: <apiDefNote>
 
-                            xmlWriter().writeEndElement(); // <cxxDefineParameter>
+                            writeEndTag(); // <cxxDefineParameter>
                         }
-                        xmlWriter().writeEndElement(); // <cxxDefineParameters>
+                        writeEndTag(); // <cxxDefineParameters>
                     }
                 }
 
                 writeLocation(fn);
-                xmlWriter().writeEndElement(); // <cxxDefineDefinition>
+                writeEndTag(); // <cxxDefineDefinition>
 
-                writeDetailedDescription(fn, marker, true, QString());
+                writeApiDesc(fn, marker, QString());
 
                 // not included: <example> or <apiImpl>
 
-                xmlWriter().writeEndElement(); // </cxxDefineDetail>
+                writeEndTag(); // </cxxDefineDetail>
 
                 // not included: <related-links>
 
-                xmlWriter().writeEndElement(); // </cxxDefine>
+                writeEndTag(); // </cxxDefine>
             }
         }
         ++m;
@@ -5212,6 +5394,7 @@ void DitaXmlGenerator::beginSubPage(const Location& location,
     writer->setAutoFormatting(true);
     writer->setAutoFormattingIndent(4);
     writer->writeStartDocument();
+    clearSectionNesting();
 }
 
 /*!
@@ -5221,6 +5404,8 @@ void DitaXmlGenerator::beginSubPage(const Location& location,
  */
 void DitaXmlGenerator::endSubPage()
 {
+    if (inSection())
+        qDebug() << "Missing </section> in" << outFileName() << sectionNestingLevel;
     xmlWriter().writeEndDocument();
     delete xmlWriterStack.pop();
     PageGenerator::endSubPage();
@@ -5238,58 +5423,18 @@ QXmlStreamWriter& DitaXmlGenerator::xmlWriter()
 }
 
 /*!
-  Writes the \e {Detailed Description} section(s) for \a node to the
-  current XML stream using the code \a marker. if the \a apiDesc flag
-  is true, then the first section of the sequence of sections written
-  will be an \c {apiDesc>} element with a \e {spectitle} attribute of
-  \e {Detailed Description}. Otherwise, the first section will be a
-  \c {<section>} element with a \c {<title>} element of \e {Detailed
-  Description}. This function calls the Generator::generateBody()
-  function to write the XML for the section list.
+  Writes the \e {<apiDesc>} element for \a node to the current XML
+  stream using the code \a marker and the \a title.
  */
-void DitaXmlGenerator::writeDetailedDescription(const Node* node,
-                                                CodeMarker* marker,
-                                                bool apiDesc,
-                                                const QString& title)
+void DitaXmlGenerator::writeApiDesc(const Node* node,
+                                    CodeMarker* marker,
+                                    const QString& title)
 {
     if (!node->doc().isEmpty()) {
         inDetailedDescription = true;
-        if (apiDesc) {
-            inApiDesc = true;
-            xmlWriter().writeStartElement("apiDesc");
-            if (!title.isEmpty()) {
-                writeGuidAttribute(title);
-                xmlWriter().writeAttribute("spectitle",title);
-            }
-            else
-                writeGuidAttribute("Detailed Description");
-            xmlWriter().writeAttribute("outputclass","details");
-        }
-        else {
-            inSection = true;
-            xmlWriter().writeStartElement("section");
-            if (!title.isEmpty()) {
-                writeGuidAttribute(title);
-                xmlWriter().writeAttribute("outputclass","details");
-                xmlWriter().writeStartElement("title");
-                xmlWriter().writeAttribute("outputclass","h2");
-                writeCharacters(title);
-                xmlWriter().writeEndElement(); // </title>
-            }
-            else {
-                writeGuidAttribute("Detailed Description");
-                xmlWriter().writeAttribute("outputclass","details");
-            }
-        }
+        enterApiDesc(QString(),title);
         generateBody(node, marker);
-        if (inApiDesc) {
-            xmlWriter().writeEndElement(); // </apiDesc>
-            inApiDesc = false;
-        }
-        else if (inSection) {
-            xmlWriter().writeEndElement(); // </section>
-            inSection = false;
-        }
+        leaveSection();
     }
     inDetailedDescription = false;
 }
@@ -5302,23 +5447,23 @@ void DitaXmlGenerator::writeNestedClasses(const Section& s,
 {
     if (s.members.isEmpty())
         return;
-    xmlWriter().writeStartElement("cxxClassNested");
-    xmlWriter().writeStartElement("cxxClassNestedDetail");
+    writeStartTag(DT_cxxClassNested);
+    writeStartTag(DT_cxxClassNestedDetail);
     
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Class) {
-            xmlWriter().writeStartElement("cxxClassNestedClass");
+            writeStartTag(DT_cxxClassNestedClass);
             QString link = linkForNode((*m), n);
             xmlWriter().writeAttribute("href", link);
             QString name = n->name() + "::" + (*m)->name();
             writeCharacters(name);
-            xmlWriter().writeEndElement(); // <cxxClassNestedClass>
+            writeEndTag(); // <cxxClassNestedClass>
         }
         ++m;
     }
-    xmlWriter().writeEndElement(); // <cxxClassNestedDetail>
-    xmlWriter().writeEndElement(); // <cxxClassNested>
+    writeEndTag(); // <cxxClassNestedDetail>
+    writeEndTag(); // <cxxClassNested>
 }
 
 /*!
@@ -5389,23 +5534,269 @@ void DitaXmlGenerator::writeDitaMap()
     doctype = "<!DOCTYPE cxxAPIMap PUBLIC \"-//NOKIA//DTD DITA C++ API Map Reference Type v0.6.0//EN\" \"dtd/cxxAPIMap.dtd\">";
 
     xmlWriter().writeDTD(doctype);
-    xmlWriter().writeStartElement("cxxAPIMap");
+    writeStartTag(DT_cxxAPIMap);
     xmlWriter().writeAttribute("id","Qt-DITA-Map");
     xmlWriter().writeAttribute("title","Qt DITA Map");
-    xmlWriter().writeStartElement("topicmeta");
-    xmlWriter().writeStartElement("shortdesc");
+    writeStartTag(DT_topicmeta);
+    writeStartTag(DT_shortdesc);
     xmlWriter().writeCharacters("The top level map for the Qt documentation");
-    xmlWriter().writeEndElement(); // </shortdesc>
-    xmlWriter().writeEndElement(); // </topicmeta>
+    writeEndTag(); // </shortdesc>
+    writeEndTag(); // </topicmeta>
     GuidMaps::iterator i = guidMaps.begin();
     while (i != guidMaps.end()) {
-        xmlWriter().writeStartElement("topicref");
+        writeStartTag(DT_topicref);
         xmlWriter().writeAttribute("href",i.key());
         xmlWriter().writeAttribute("type","topic");
-        xmlWriter().writeEndElement(); // </topicref>
+        writeEndTag(); // </topicref>
         ++i;
     }
     endSubPage();
 }
 
+/*!
+  Looks up the tag name for \a t in the map of metadata
+  values for the current topic in \a inner. If a value
+  for the tag is found, the element is written with the
+  found value. Otherwise if \a force is set, an empty
+  element is written using the tag.
+
+  Returns true or false depending on whether it writes
+  an element using the tag \a t.
+
+  \note If \a t is found in the metadata map, it is erased.
+  i.e. Once you call this function for a particular \a t,
+  you consume \a t.
+ */
+bool DitaXmlGenerator::writeMetadataElement(const InnerNode* inner,
+                                            DitaXmlGenerator::DitaTag t,
+                                            bool force)
+{
+    QString s = getMetadataElement(inner,t);
+    if (s.isEmpty() && !force)
+        return false;
+    writeStartTag(t);
+    if (!s.isEmpty())
+        xmlWriter().writeCharacters(s);
+    writeEndTag();
+    return true;
+}
+
+
+/*!
+  Looks up the tag name for \a t in the map of metadata
+  values for the current topic in \a inner. If one or more
+  value sfor the tag are found, the elements are written.
+  Otherwise nothing is written.
+
+  Returns true or false depending on whether it writes
+  at least one element using the tag \a t.
+
+  \note If \a t is found in the metadata map, it is erased.
+  i.e. Once you call this function for a particular \a t,
+  you consume \a t.
+ */
+bool DitaXmlGenerator::writeMetadataElements(const InnerNode* inner,
+                                             DitaXmlGenerator::DitaTag t)
+{
+    QStringList s = getMetadataElements(inner,t);
+    if (s.isEmpty())
+        return false;
+    for (int i=0; i<s.size(); ++i) {
+        writeStartTag(t);
+        xmlWriter().writeCharacters(s[i]);
+        writeEndTag();
+    }
+    return true;
+}
+
+/*!
+  Looks up the tag name for \a t in the map of metadata
+  values for the current topic in \a inner. If a value
+  for the tag is found, the value is returned.
+
+  \note If \a t is found in the metadata map, it is erased.
+  i.e. Once you call this function for a particular \a t,
+  you consume \a t.
+ */
+QString DitaXmlGenerator::getMetadataElement(const InnerNode* inner, DitaXmlGenerator::DitaTag t)
+{
+    QString s = Generator::getMetadataElement(inner, ditaTags[t]);
+    if (s.isEmpty())
+        s = metadataDefault(t);
+    return s;
+}
+
+/*!
+  Looks up the tag name for \a t in the map of metadata
+  values for the current topic in \a inner. If values
+  for the tag are found, they are returned in a string
+  list.
+
+  \note If \a t is found in the metadata map, all the
+  pairs having the key \a t are erased. i.e. Once you
+  all this function for a particular \a t, you consume
+  \a t.
+ */
+QStringList DitaXmlGenerator::getMetadataElements(const InnerNode* inner,
+                                                  DitaXmlGenerator::DitaTag t)
+{
+    QStringList s = Generator::getMetadataElements(inner,ditaTags[t]);
+    if (s.isEmpty())
+        s.append(metadataDefault(t));
+    return s;
+}
+
+/*!
+  Returns the value of key \a t or an empty string
+  if \a t is not found in the map.
+ */
+QString DitaXmlGenerator::metadataDefault(DitaTag t) const
+{
+    return metadataDefaults.value(ditaTags[t]);
+}
+
+/*!
+  Writes the <prolog> element for the \a inner node
+  using the \a marker. The <prolog> element contains
+  the <metadata> element, plus some others. This
+  function writes one or more of these elements:
+
+  \list
+    \o <audience> *
+    \o <author> *
+    \o <brand>
+    \o <category> *
+    \o <compomnent> *
+    \o <copyrholder> *
+    \o <copyright> *
+    \o <created>
+    \o <copyryear> *
+    \o <critdates>
+    \o <keyword>
+    \o <keywords>
+    \o <metadata> *
+    \o <othermeta>
+    \o <permissions> *
+    \o <platform>
+    \o <prodinfo> *
+    \o <prodname> *
+    \o <prolog> *
+    \o <publisher> *
+    \o <resourceid>
+    \o <revised>
+    \o <source>
+    \o <tm>
+    \o <unknown>
+    \o <vrm> *
+    \o <vrmlist> *
+  \endlist
+
+  \node * means the tag has been used.
+  
+ */
+void
+DitaXmlGenerator::writeProlog(const InnerNode* inner, CodeMarker* marker)
+{
+    if (!inner)
+        return;
+    writeStartTag(DT_prolog);
+    writeMetadataElements(inner,DT_author);
+    writeMetadataElement(inner,DT_publisher);
+    QString s = getMetadataElement(inner,DT_copyryear);
+    QString t = getMetadataElement(inner,DT_copyrholder);
+    writeStartTag(DT_copyright);
+    writeStartTag(DT_copyryear);
+    if (!s.isEmpty())
+        xmlWriter().writeAttribute("year",s);
+    writeEndTag(); // </copyryear>
+    writeStartTag(DT_copyrholder);
+    if (!s.isEmpty())
+        xmlWriter().writeCharacters(t);
+    writeEndTag(); // </copyrholder>
+    writeEndTag(); // </copyright>
+    s = getMetadataElement(inner,DT_permissions);
+    writeStartTag(DT_permissions);
+    xmlWriter().writeAttribute("view",s);
+    writeEndTag(); // </permissions>
+    writeStartTag(DT_metadata);
+    QStringList sl = getMetadataElements(inner,DT_audience);
+    if (!sl.isEmpty()) {
+        for (int i=0; i<sl.size(); ++i) {
+            writeStartTag(DT_audience);
+            xmlWriter().writeAttribute("type",sl[i]);
+            writeEndTag(); // </audience>
+        }
+    }
+    if (!writeMetadataElement(inner,DT_category,false)) {
+        writeStartTag(DT_category);
+        QString category = "Page";
+        if (inner->type() == Node::Class)
+            category = "Class reference";
+        else if (inner->type() == Node::Namespace)
+            category = "Namespace";
+        else if (inner->type() == Node::Fake) {
+            if (inner->subType() == Node::QmlClass)
+                category = "QML Element Reference";
+            else if (inner->subType() == Node::QmlBasicType)
+                category = "QML Basic Type";
+            else if (inner->subType() == Node::HeaderFile)
+                category = "Header File";
+            else if (inner->subType() == Node::Module)
+                category = "Module";
+            else if (inner->subType() == Node::File)
+                category = "Example Source File";
+            else if (inner->subType() == Node::Example)
+                category = "Example";
+            else if (inner->subType() == Node::Image)
+                category = "Image";
+            else if (inner->subType() == Node::Group)
+                category = "Group";
+            else if (inner->subType() == Node::Page)
+                category = "Page";
+            else if (inner->subType() == Node::ExternalPage)
+                category = "External Page"; // Is this necessary?
+        }
+        xmlWriter().writeCharacters(category);
+        writeEndTag(); // </category>
+    }
+    if (vrm.size() > 0) {
+        writeStartTag(DT_prodinfo);
+        if (!writeMetadataElement(inner,DT_prodname,false)) {
+            writeStartTag(DT_prodname);
+            xmlWriter().writeCharacters(projectDescription);
+            writeEndTag(); // </prodname>
+        }
+        writeStartTag(DT_vrmlist);
+        writeStartTag(DT_vrm);
+        if (vrm.size() > 0)
+            xmlWriter().writeAttribute("version",vrm[0]);
+        if (vrm.size() > 1)
+            xmlWriter().writeAttribute("release",vrm[1]);
+        if (vrm.size() > 2)
+            xmlWriter().writeAttribute("modification",vrm[2]);
+        writeEndTag(); // <vrm>
+        writeEndTag(); // <vrmlist>
+        if (!writeMetadataElement(inner,DT_component,false)) {
+            QString component = inner->moduleName();
+            if (!component.isEmpty()) {
+                writeStartTag(DT_component);
+                xmlWriter().writeCharacters(component);
+                writeEndTag(); // </component>
+            }
+        }
+        writeEndTag(); // </prodinfo>
+    }
+    const QStringMultiMap& metaTagMap = inner->doc().metaTagMap(); 
+    QMapIterator<QString, QString> i(metaTagMap);
+    while (i.hasNext()) {
+        i.next();
+        writeStartTag(DT_othermeta);
+        xmlWriter().writeAttribute("name",i.key());
+        xmlWriter().writeAttribute("content",i.value());
+        writeEndTag(); // </othermeta>
+    }
+    writeEndTag(); // </metadata>
+    writeEndTag(); // </prolog>
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 4aae657..ffca234 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -81,6 +81,182 @@ class DitaXmlGenerator : public PageGenerator
         LastSinceType
     };
 
+    enum DitaTag {
+        DT_NONE,
+        DT_alt,
+        DT_apiDesc,
+        DT_APIMap,
+        DT_apiName,
+        DT_audience,
+        DT_author,
+        DT_b,
+        DT_body,
+        DT_bodydiv,
+        DT_brand,
+        DT_category,
+        DT_codeblock,
+        DT_comment,
+        DT_component,
+        DT_copyrholder,
+        DT_copyright,
+        DT_copyryear,
+        DT_created,
+        DT_critdates,
+        DT_cxxAPIMap,
+        DT_cxxClass,
+        DT_cxxClassAbstract,
+        DT_cxxClassAccessSpecifier,
+        DT_cxxClassAPIItemLocation,
+        DT_cxxClassBaseClass,
+        DT_cxxClassDeclarationFile,
+        DT_cxxClassDeclarationFileLine,
+        DT_cxxClassDefinition,
+        DT_cxxClassDerivation,
+        DT_cxxClassDerivationAccessSpecifier,
+        DT_cxxClassDerivations,
+        DT_cxxClassDetail,
+        DT_cxxClassNested,
+        DT_cxxClassNestedClass,
+        DT_cxxClassNestedDetail,
+        DT_cxxDefine,
+        DT_cxxDefineAccessSpecifier,
+        DT_cxxDefineAPIItemLocation,
+        DT_cxxDefineDeclarationFile,
+        DT_cxxDefineDeclarationFileLine,
+        DT_cxxDefineDefinition,
+        DT_cxxDefineDetail,
+        DT_cxxDefineNameLookup,
+        DT_cxxDefineParameter,
+        DT_cxxDefineParameterDeclarationName,
+        DT_cxxDefineParameters,
+        DT_cxxDefinePrototype,
+        DT_cxxDefineReimplemented,
+        DT_cxxEnumeration,
+        DT_cxxEnumerationAccessSpecifier,
+        DT_cxxEnumerationAPIItemLocation,
+        DT_cxxEnumerationDeclarationFile,
+        DT_cxxEnumerationDeclarationFileLine,
+        DT_cxxEnumerationDefinition,
+        DT_cxxEnumerationDefinitionFile,
+        DT_cxxEnumerationDefinitionFileLineStart,
+        DT_cxxEnumerationDefinitionFileLineEnd,
+        DT_cxxEnumerationDetail,
+        DT_cxxEnumerationNameLookup,
+        DT_cxxEnumerationPrototype,
+        DT_cxxEnumerationScopedName,
+        DT_cxxEnumerator,
+        DT_cxxEnumeratorInitialiser,
+        DT_cxxEnumeratorNameLookup,
+        DT_cxxEnumeratorPrototype,
+        DT_cxxEnumerators,
+        DT_cxxEnumeratorScopedName,
+        DT_cxxFunction,
+        DT_cxxFunctionAccessSpecifier,
+        DT_cxxFunctionAPIItemLocation,
+        DT_cxxFunctionConst,
+        DT_cxxFunctionConstructor,
+        DT_cxxFunctionDeclarationFile,
+        DT_cxxFunctionDeclarationFileLine,
+        DT_cxxFunctionDeclaredType,
+        DT_cxxFunctionDefinition,
+        DT_cxxFunctionDestructor,
+        DT_cxxFunctionDetail,
+        DT_cxxFunctionNameLookup,
+        DT_cxxFunctionParameter,
+        DT_cxxFunctionParameterDeclarationName,
+        DT_cxxFunctionParameterDeclaredType,
+        DT_cxxFunctionParameterDefaultValue,
+        DT_cxxFunctionParameters,
+        DT_cxxFunctionPrototype,
+        DT_cxxFunctionPureVirtual,
+        DT_cxxFunctionReimplemented,
+        DT_cxxFunctionScopedName,
+        DT_cxxFunctionStorageClassSpecifierStatic,
+        DT_cxxFunctionVirtual,
+        DT_cxxTypedef,
+        DT_cxxTypedefAccessSpecifier,
+        DT_cxxTypedefAPIItemLocation,
+        DT_cxxTypedefDeclarationFile,
+        DT_cxxTypedefDeclarationFileLine,
+        DT_cxxTypedefDefinition,
+        DT_cxxTypedefDetail,
+        DT_cxxTypedefNameLookup,
+        DT_cxxTypedefScopedName,
+    	DT_cxxVariable,
+    	DT_cxxVariableAccessSpecifier,
+    	DT_cxxVariableAPIItemLocation,
+        DT_cxxVariableDeclarationFile,
+        DT_cxxVariableDeclarationFileLine,
+    	DT_cxxVariableDeclaredType,
+    	DT_cxxVariableDefinition,
+    	DT_cxxVariableDetail,
+    	DT_cxxVariableNameLookup,
+    	DT_cxxVariablePrototype,
+    	DT_cxxVariableReimplemented,
+    	DT_cxxVariableScopedName,
+    	DT_cxxVariableStorageClassSpecifierStatic,
+        DT_data,
+        DT_dataabout,
+        DT_dd,
+        DT_dl,
+        DT_dlentry,
+        DT_dt,
+        DT_entry,
+        DT_fig,
+        DT_i,
+        DT_image,
+        DT_keyword,
+        DT_keywords,
+        DT_li,
+        DT_link,
+        DT_linktext,
+        DT_lq,
+        DT_metadata,
+        DT_ol,
+        DT_othermeta,
+        DT_p,
+        DT_parameter,
+        DT_permissions,
+        DT_ph,
+        DT_platform,
+        DT_pre,
+        DT_prodinfo,
+        DT_prodname,
+        DT_prolog,
+        DT_publisher,
+        DT_relatedLinks,
+        DT_resourceid,
+        DT_revised,
+        DT_row,
+        DT_section,
+        DT_sectiondiv,
+        DT_shortdesc,
+        DT_simpletable,
+        DT_source,
+        DT_stentry,
+        DT_sthead,
+        DT_strow,
+        DT_sub,
+        DT_sup,
+        DT_table,
+        DT_tbody,
+        DT_tgroup,
+        DT_thead,
+        DT_title,
+        DT_tm,
+        DT_topic,
+        DT_topicmeta,
+        DT_topicref,
+        DT_tt,
+        DT_u,
+        DT_ul,
+        DT_unknown,
+        DT_vrm,
+        DT_vrmlist,
+        DT_xref,
+        DT_LAST
+    };
+
  public:
     DitaXmlGenerator();
     ~DitaXmlGenerator();
@@ -139,6 +315,13 @@ class DitaXmlGenerator : public PageGenerator
     void writePropertyParameter(const QString& tag, const NodeList& nlist);
     void writeRelatedLinks(const FakeNode* fake, CodeMarker* marker);
     void writeLink(const Node* node, const QString& tex, const QString& role);
+    void writeProlog(const InnerNode* inner, CodeMarker* marker);
+    bool writeMetadataElement(const InnerNode* inner, 
+                              DitaXmlGenerator::DitaTag t, 
+                              bool force=true);
+    bool writeMetadataElements(const InnerNode* inner, DitaXmlGenerator::DitaTag t);
+    QString getMetadataElement(const InnerNode* inner, DitaXmlGenerator::DitaTag t);
+    QStringList getMetadataElements(const InnerNode* inner, DitaXmlGenerator::DitaTag t);
 
  private:
     enum SubTitleSize { SmallSubTitle, LargeSubTitle };
@@ -254,27 +437,45 @@ class DitaXmlGenerator : public PageGenerator
     virtual void endSubPage();
     virtual void generateInnerNode(const InnerNode* node);
     QXmlStreamWriter& xmlWriter();
-    void writeDetailedDescription(const Node* node,
-                                  CodeMarker* marker,
-                                  bool apiDesc,
-                                  const QString& title);
+    void writeApiDesc(const Node* node, CodeMarker* marker, const QString& title);
     void addLink(const QString& href, const QStringRef& text);
     void writeDitaMap();
+    void writeStartTag(DitaTag t);
+    void writeEndTag(DitaTag t=DT_NONE);
+    DitaTag currentTag();
+    void clearSectionNesting() { sectionNestingLevel = 0; } 
+    int enterApiDesc(const QString& outputclass, const QString& title);
+    int enterSection(const QString& outputclass, const QString& title);
+    int leaveSection();
+    bool inSection() const { return (sectionNestingLevel > 0); }
+    int currentSectionNestingLevel() const { return sectionNestingLevel; }
+    QString metadataDefault(DitaTag t) const;
 
  private:
-    QMap<QString, QString> refMap;
-    QMap<QString, QString> name2guidMap;
-    GuidMaps guidMaps;
-    int codeIndent;
+    /*
+      These flags indicate which elements the generator
+      is currently outputting.
+     */
+    bool inContents;
+    bool inDetailedDescription;
+    bool inLegaleseText;
     bool inLink;
     bool inObsoleteLink;
-    bool inContents;
     bool inSectionHeading;
     bool inTableHeader;
     bool inTableBody;
-    int numTableRows;
-    bool threeColumnEnumValueTable;
+
+    bool noLinks;
+    bool obsoleteLinks;
     bool offlineDocs;
+    bool threeColumnEnumValueTable;
+
+    int codeIndent;
+    int numTableRows;
+    int divNestingLevel;
+    int sectionNestingLevel;
+    int tableColumnCount;
+
     QString link;
     QStringList sectionNumber;
     QRegExp funcLeftParen;
@@ -288,12 +489,14 @@ class DitaXmlGenerator : public PageGenerator
     QString projectDescription;
     QString projectUrl;
     QString navigationLinks;
+    QString version;
+    QStringList vrm;
     QStringList stylesheets;
     QStringList customHeadElements;
     const Tree* myTree;
-    bool obsoleteLinks;
-    bool noLinks;
-    int tableColumnCount;
+    QMap<QString, QString> refMap;
+    QMap<QString, QString> name2guidMap;
+    GuidMaps guidMaps;
     QMap<QString, NodeMap > moduleClassMap;
     QMap<QString, NodeMap > moduleNamespaceMap;
     NodeMap nonCompatClasses;
@@ -312,12 +515,10 @@ class DitaXmlGenerator : public PageGenerator
     NewClassMaps newClassMaps;
     NewClassMaps newQmlClassMaps;
     static int id;
-    static bool inApiDesc;
-    static bool inSection;
-    static bool inDetailedDescription;
-    static bool inLegaleseText;
-
+    static QString ditaTags[];
     QStack<QXmlStreamWriter*> xmlWriterStack;
+    QStack<DitaTag> tagStack;
+    QStringMultiMap metadataDefaults;
 };
 
 #define DITAXMLGENERATOR_ADDRESS           "address"
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index a730799..2239f43 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -55,6 +55,7 @@
 #include <qregexp.h>
 #include <ctype.h>
 #include <limits.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,6 +63,7 @@ Q_GLOBAL_STATIC(QSet<QString>, null_Set_QString)
 Q_GLOBAL_STATIC(QStringList, null_QStringList)
 Q_GLOBAL_STATIC(QList<Text>, null_QList_Text)
 Q_GLOBAL_STATIC(QStringMap, null_QStringMap)
+Q_GLOBAL_STATIC(QStringMultiMap, null_QStringMultiMap)
 
 struct Macro
 {
@@ -90,8 +92,8 @@ enum {
     CMD_QUOTEFROMFILE, CMD_QUOTEFUNCTION, CMD_RAW, CMD_ROW,
     CMD_SA, CMD_SECTION1, CMD_SECTION2, CMD_SECTION3,
     CMD_SECTION4, CMD_SIDEBAR, CMD_SINCELIST, CMD_SKIPLINE,
-    CMD_SKIPTO, CMD_SKIPUNTIL, CMD_SNIPPET, CMD_SUB, CMD_SUP,
-    CMD_TABLE, CMD_TABLEOFCONTENTS, CMD_TARGET, CMD_TT,
+    CMD_SKIPTO, CMD_SKIPUNTIL, CMD_SNIPPET, CMD_SPAN, CMD_SUB,
+    CMD_SUP, CMD_TABLE, CMD_TABLEOFCONTENTS, CMD_TARGET, CMD_TT,
     CMD_UNDERLINE, CMD_UNICODE, CMD_VALUE, CMD_WARNING,
 #ifdef QDOC_QML    
     CMD_QML, CMD_ENDQML, CMD_CPP, CMD_ENDCPP, CMD_QMLTEXT,
@@ -184,6 +186,7 @@ static struct {
     { "skipto", CMD_SKIPTO, 0 },
     { "skipuntil", CMD_SKIPUNTIL, 0 },
     { "snippet", CMD_SNIPPET, 0 },
+    { "span", CMD_SPAN, 0 },
     { "sub", CMD_SUB, 0 },
     { "sup", CMD_SUP, 0 },
     { "table", CMD_TABLE, 0 },
@@ -226,7 +229,7 @@ class DocPrivateExtra
     QList<int>          tableOfContentsLevels;
     QList<Atom*>        keywords;
     QList<Atom*>        targets;
-    QStringMap          metaMap;
+    QStringMultiMap          metaMap;
 
     DocPrivateExtra()
         : granularity(Doc::Part) { }
@@ -358,7 +361,7 @@ class DocParser
     void checkExpiry(const QString& date);
     void insertBaseName(const QString &baseName);
     void insertTarget(const QString& target, bool keyword);
-    void include(const QString& fileName);
+    void include(const QString& fileName, const QString& identifier);
     void startFormat(const QString& format, int cmd);
     bool openCommand(int cmd);
     bool closeCommand(int endCmd);
@@ -366,14 +369,15 @@ class DocParser
     void endSection(int unit, int endCmd);
     void parseAlso();
     void append(Atom::Type type, const QString& string = "");
+    void append(Atom::Type type, const QString& p1, const QString& p2);
     void appendChar(QChar ch);
     void appendWord(const QString &word);
     void appendToCode(const QString &code);
     void appendToCode(const QString &code, Atom::Type defaultType);
     void startNewPara();
     void enterPara(Atom::Type leftType = Atom::ParaLeft,
-                    Atom::Type rightType = Atom::ParaRight,
-                    const QString& string = "");
+                   Atom::Type rightType = Atom::ParaRight,
+                   const QString& string = "");
     void leavePara();
     void leaveValue();
     void leaveValueList();
@@ -405,9 +409,13 @@ class DocParser
     Location cachedLoc;
     int cachedPos;
 
-    DocPrivate *priv;
-    enum ParaState { OutsidePara, InsideSingleLinePara, InsideMultiLinePara };
-    ParaState paraState;
+    DocPrivate* priv;
+    enum ParagraphState {
+        OutsideParagraph,
+        InSingleLineParagraph,
+        InMultiLineParagraph
+    };
+    ParagraphState paraState;
     bool inTableHeader;
     bool inTableRow;
     bool inTableItem;
@@ -454,7 +462,7 @@ void DocParser::parse(const QString& source,
     priv = docPrivate;
     priv->text << Atom::Nop;
 
-    paraState = OutsidePara;
+    paraState = OutsideParagraph;
     inTableHeader = false;
     inTableRow = false;
     inTableItem = false;
@@ -470,7 +478,7 @@ void DocParser::parse(const QString& source,
 
     CodeMarker *marker = 0;
     Atom *currentLinkAtom = 0;
-    QString x;
+    QString p1, p2;
     QStack<bool> preprocessorSkipping;
     int numPreprocessorSkipping = 0;
 
@@ -509,11 +517,11 @@ void DocParser::parse(const QString& source,
                     switch (cmd) {
                     case CMD_A:
                         enterPara();
-                        x = getArgument();
+                        p1 = getArgument();
                         append(Atom::FormattingLeft,ATOM_FORMATTING_PARAMETER);
-                        append(Atom::String, x);
+                        append(Atom::String, p1);
                         append(Atom::FormattingRight,ATOM_FORMATTING_PARAMETER);
-                        priv->params.insert(x);
+                        priv->params.insert(p1);
                         break;
                     case CMD_ABSTRACT:
                         if (openCommand(cmd)) {
@@ -538,20 +546,20 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_C:
                         enterPara();
-                        x = untabifyEtc(getArgument(true));
-                        marker = CodeMarker::markerForCode(x);
-                        append(Atom::C, marker->markedUpCode(x, 0, location()));
+                        p1 = untabifyEtc(getArgument(true));
+                        marker = CodeMarker::markerForCode(p1);
+                        append(Atom::C, marker->markedUpCode(p1, 0, location()));
                         break;
                     case CMD_CAPTION:
                         leavePara();
-                        /* ... */
+                        enterPara(Atom::CaptionLeft, Atom::CaptionRight);
                         break;
                     case CMD_CHAPTER:
                         startSection(Doc::Chapter, cmd);
                         break;
                     case CMD_CODE:
                         leavePara();
-                        append(Atom::Code, getCode(CMD_CODE, marker));
+                        append(Atom::Code, getCode(CMD_CODE, 0));
                         break;
 #ifdef QDOC_QML
                     case CMD_QML:
@@ -568,10 +576,14 @@ void DocParser::parse(const QString& source,
 #endif
                     case CMD_DIV:
                         leavePara();
-                        x = getArgument(true);
-                        append(Atom::Div, x);
+                        p1 = getArgument(true);
+                        append(Atom::DivLeft, p1);
                         openedCommands.push(cmd);
-                        enterPara();
+                        break;
+                    case CMD_ENDDIV:
+                        leavePara();
+                        append(Atom::DivRight);
+                        closeCommand(cmd);
                         break;
                     case CMD_CODELINE:
                         {
@@ -635,16 +647,11 @@ void DocParser::parse(const QString& source,
                         }
                         break;
                     case CMD_ENDCHAPTER:
-                        endSection(0, cmd);
+                        endSection(Doc::Chapter, cmd);
                         break;
                     case CMD_ENDCODE:
                         closeCommand(cmd);
                         break;
-                    case CMD_ENDDIV:
-                        leavePara();
-                        append(Atom::EndDiv);
-                        closeCommand(cmd);
-                        break;
 #ifdef QDOC_QML
                     case CMD_ENDQML:
                         closeCommand(cmd);
@@ -660,7 +667,7 @@ void DocParser::parse(const QString& source,
                         if (closeCommand(cmd)) {
                             leavePara();
                             append(Atom::FootnoteRight);
-                            paraState = InsideMultiLinePara; // ###
+                            paraState = InMultiLineParagraph; // ###
                         }
                         break;
                     case CMD_ENDIF:
@@ -747,7 +754,7 @@ void DocParser::parse(const QString& source,
                         if (openCommand(cmd)) {
                             enterPara();
                             append(Atom::FootnoteLeft);
-                            paraState = OutsidePara; // ###
+                            paraState = OutsideParagraph; // ###
                         }
                         break;
                     case CMD_ANNOTATEDLIST:
@@ -798,7 +805,11 @@ void DocParser::parse(const QString& source,
                         append(Atom::ImageText, getRestOfLine());
                         break;
                     case CMD_INCLUDE:
-                        include(getArgument());
+                        {
+                            QString fileName = getArgument();
+                            QString identifier = getRestOfLine();
+                            include(fileName, identifier);
+                        }
                         break;
                     case CMD_INLINEIMAGE:
                         enterPara();
@@ -807,7 +818,7 @@ void DocParser::parse(const QString& source,
                         append(Atom::String, " ");
                         break;
                     case CMD_INDEX:
-                        if (paraState == OutsidePara) {
+                        if (paraState == OutsideParagraph) {
                             enterPara();
                             indexStartedPara = true;
                         }
@@ -826,23 +837,23 @@ void DocParser::parse(const QString& source,
                     case CMD_L:
                         enterPara();
                         if (isLeftBraceAhead()) {
-                            x = getArgument();
-                            append(Atom::Link, x);
+                            p1 = getArgument();
+                            append(Atom::Link, p1);
                             if (isLeftBraceAhead()) {
                                 currentLinkAtom = priv->text.lastAtom();
                                 startFormat(ATOM_FORMATTING_LINK, cmd);
                             }
                             else {
                                 append(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
-                                append(Atom::String, cleanLink(x));
+                                append(Atom::String, cleanLink(p1));
                                 append(Atom::FormattingRight, ATOM_FORMATTING_LINK);
                             }
                         }
                         else {
-                            x = getArgument();
-                            append(Atom::Link, x);
+                            p1 = getArgument();
+                            append(Atom::Link, p1);
                             append(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
-                            append(Atom::String, cleanLink(x));
+                            append(Atom::String, cleanLink(p1));
                             append(Atom::FormattingRight, ATOM_FORMATTING_LINK);
                         }
                         break;
@@ -855,8 +866,8 @@ void DocParser::parse(const QString& source,
                     case CMD_LINK:
                         if (openCommand(cmd)) {
                             enterPara();
-                            x = getArgument();
-                            append(Atom::Link, x);
+                            p1 = getArgument();
+                            append(Atom::Link, p1);
                             append(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
                             skipSpacesOrOneEndl();
                         }
@@ -870,8 +881,8 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_META:
                         priv->constructExtra();
-                        x = getArgument();
-                        priv->extra->metaMap.insert(x, getRestOfLine());
+                        p1 = getArgument();
+                        priv->extra->metaMap.insert(p1, getArgument());
                         break;
                     case CMD_NEWCODE:
                         location().warning(tr("Unexpected '\\%1'").arg(cmdName(CMD_NEWCODE)));
@@ -895,9 +906,13 @@ void DocParser::parse(const QString& source,
                             enterPara();
                         }
                         else if (openedCommands.top() == CMD_TABLE) {
-                            x = "1,1";
-                            if (isLeftBraceAhead())
-                                x = getArgument();
+                            p1 = "1,1";
+                            if (isLeftBraceAhead()) {
+                                p1 = getArgument();
+                                if (isLeftBraceAhead()) {
+                                    p2 = getArgument();
+                                }
+                            }
 
                             if (!inTableHeader && !inTableRow) {
                                 location().warning(tr("Missing '\\%1' or '\\%1' before '\\%3'")
@@ -912,7 +927,7 @@ void DocParser::parse(const QString& source,
                                 inTableItem = false;
                             }
 
-                            append(Atom::TableItemLeft, x);
+                            append(Atom::TableItemLeft, p1, p2);
                             inTableItem = true;
                         }
                         else {
@@ -931,11 +946,11 @@ void DocParser::parse(const QString& source,
                         getUntilEnd(cmd);
                         break;
                     case CMD_OMITVALUE:
-                        x = getArgument();
-                        if (!priv->enumItemList.contains(x))
-                            priv->enumItemList.append(x);
-                        if (!priv->omitEnumItemList.contains(x))
-                            priv->omitEnumItemList.append(x);
+                        p1 = getArgument();
+                        if (!priv->enumItemList.contains(p1))
+                            priv->enumItemList.append(p1);
+                        if (!priv->omitEnumItemList.contains(p1))
+                            priv->omitEnumItemList.append(p1);
                         break;
                     case CMD_PART:
                         startSection(Doc::Part, cmd);
@@ -1004,35 +1019,38 @@ void DocParser::parse(const QString& source,
                     case CMD_QUOTEFUNCTION:
                         leavePara();
                         marker = quoteFromFile();
-                        x = getRestOfLine();
+                        p1 = getRestOfLine();
                         if (!quoting) {
                             quoter.quoteTo(location(), cmdStr,
-                                            slashed(marker->functionBeginRegExp(x)));
+                                            slashed(marker->functionBeginRegExp(p1)));
                             append(Atom::Code,
                                     quoter.quoteUntil(location(), cmdStr,
-                                            slashed(marker->functionEndRegExp(x))));
+                                            slashed(marker->functionEndRegExp(p1))));
                             quoter.reset();
                         }
                         else {
                             append(Atom::CodeQuoteCommand, cmdStr);
-                            append(Atom::CodeQuoteArgument, slashed(marker->functionEndRegExp(x)));
+                            append(Atom::CodeQuoteArgument, slashed(marker->functionEndRegExp(p1)));
                         }
                         break;
                     case CMD_RAW:
                         leavePara();
-                        x = getRestOfLine();
-                        if (x.isEmpty())
+                        p1 = getRestOfLine();
+                        if (p1.isEmpty())
                             location().warning(tr("Missing format name after '\\%1")
                                                .arg(cmdName(CMD_RAW)));
-                        append(Atom::FormatIf, x);
+                        append(Atom::FormatIf, p1);
                         append(Atom::RawString, untabifyEtc(getUntilEnd(cmd)));
                         append(Atom::FormatElse);
                         append(Atom::FormatEndif);
                         break;
                     case CMD_ROW:
                         if (openedCommands.top() == CMD_TABLE) {
+                            p1.clear();
+                            if (isLeftBraceAhead())
+                                p1 = getArgument(true);
                             leaveTableRow();
-                            append(Atom::TableRowLeft);
+                            append(Atom::TableRowLeft,p1);
                             inTableRow = true;
                         }
                         else {
@@ -1102,6 +1120,10 @@ void DocParser::parse(const QString& source,
                             append(Atom::CodeQuoteArgument, getRestOfLine());
                         }
                         break;
+                    case CMD_SPAN:
+                        p1 = ATOM_FORMATTING_SPAN + getArgument(true);
+                        startFormat(p1, cmd);
+                        break;
                     case CMD_SNIPPET:
                         leavePara();
                         {
@@ -1125,22 +1147,22 @@ void DocParser::parse(const QString& source,
                         startFormat(ATOM_FORMATTING_SUPERSCRIPT, cmd);
                         break;
                     case CMD_TABLE:
-                        x = getRestOfLine();
+                        p1 = getRestOfLine();
                         if (openCommand(cmd)) {
                             leavePara();
-                            append(Atom::TableLeft, x);
+                            append(Atom::TableLeft, p1);
                             inTableHeader = false;
                             inTableRow = false;
                             inTableItem = false;
                         }
                         break;
                     case CMD_TABLEOFCONTENTS:
-                        x = "1";
+                        p1 = "1";
                         if (isLeftBraceAhead())
-                            x = getArgument();
-                        x += ",";
-                        x += QString::number((int)getSectioningUnit());
-                        append(Atom::TableOfContents, x);
+                            p1 = getArgument();
+                        p1 += ",";
+                        p1 += QString::number((int)getSectioningUnit());
+                        append(Atom::TableOfContents, p1);
                         break;
                     case CMD_TARGET:
                         insertTarget(getRestOfLine(),false);
@@ -1153,16 +1175,16 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_UNICODE:
                         enterPara();
-                        x = getArgument();
+                        p1 = getArgument();
                         {
                             bool ok;
-                            uint unicodeChar = x.toUInt(&ok, 0);
+                            uint unicodeChar = p1.toUInt(&ok, 0);
                             if (!ok ||
                                 (unicodeChar == 0x0000) ||
                                 (unicodeChar > 0xFFFE)) {
                                 location().warning(tr("Invalid Unicode character '%1' specified "
                                                       "with '%2'")
-                                                   .arg(x, cmdName(CMD_UNICODE)));
+                                                   .arg(p1, cmdName(CMD_UNICODE)));
                             }
                             else {
                                 append(Atom::String, QChar(unicodeChar));
@@ -1172,13 +1194,13 @@ void DocParser::parse(const QString& source,
                     case CMD_VALUE:
                         leaveValue();
                         if (openedLists.top().style() == OpenedList::Value) {
-                            x = getArgument();
-                            if (!priv->enumItemList.contains(x))
-                                priv->enumItemList.append(x);
+                            p1 = getArgument();
+                            if (!priv->enumItemList.contains(p1))
+                                priv->enumItemList.append(p1);
 
                             openedLists.top().next();
                             append(Atom::ListTagLeft, ATOM_LIST_VALUE);
-                            append(Atom::String, x);
+                            append(Atom::String, p1);
                             append(Atom::ListTagRight, ATOM_LIST_VALUE);
                             append(Atom::ListItemLeft, ATOM_LIST_VALUE);
 
@@ -1191,7 +1213,8 @@ void DocParser::parse(const QString& source,
                         }
                         break;
                     case CMD_WARNING:
-                        startNewPara();
+                        leavePara();
+                        enterPara();
                         append(Atom::FormattingLeft, ATOM_FORMATTING_BOLD);
                         append(Atom::String, "Warning:");
                         append(Atom::FormattingRight, ATOM_FORMATTING_BOLD);
@@ -1199,13 +1222,13 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_OVERLOAD:
                         priv->metacommandsUsed.insert(cmdStr);
-                        x.clear();
+                        p1.clear();
                         if (!isBlankLine())
-                            x = getRestOfLine();
-                        if (!x.isEmpty()) {
+                            p1 = getRestOfLine();
+                        if (!p1.isEmpty()) {
                             append(Atom::ParaLeft);
                             append(Atom::String, "This function overloads ");
-                            append(Atom::AutoLink,x);
+                            append(Atom::AutoLink,p1);
                             append(Atom::String, ".");
                             append(Atom::ParaRight);
                         }
@@ -1213,9 +1236,9 @@ void DocParser::parse(const QString& source,
                             append(Atom::ParaLeft);
                             append(Atom::String,"This is an overloaded function.");
                             append(Atom::ParaRight);
-                            x = getMetaCommandArgument(cmdStr);
+                            p1 = getMetaCommandArgument(cmdStr);
                         }
-                        priv->metaCommandMap[cmdStr].append(x);
+                        priv->metaCommandMap[cmdStr].append(p1);
                         break;
                     case NOT_A_CMD:
                         if (metaCommandSet.contains(cmdStr)) {
@@ -1281,8 +1304,7 @@ void DocParser::parse(const QString& source,
                 braceDepth--;
                 pos++;
 
-                QMap<int, QString>::Iterator f =
-                    pendingFormats.find(braceDepth);
+                QMap<int, QString>::Iterator f = pendingFormats.find(braceDepth);
                 if (f == pendingFormats.end()) {
                     enterPara();
                     appendChar('}');
@@ -1319,7 +1341,7 @@ void DocParser::parse(const QString& source,
                     newWord = false;
                 }
 
-                if (paraState == OutsidePara) {
+                if (paraState == OutsideParagraph) {
                     if (ch.isSpace()) {
                         ++pos;
                         newWord = false;
@@ -1333,7 +1355,7 @@ void DocParser::parse(const QString& source,
                     if (ch.isSpace()) {
                         ++pos;
                         if ((ch == '\n') &&
-                            (paraState == InsideSingleLinePara ||
+                            (paraState == InSingleLineParagraph ||
                              isBlankLine())) {
                             leavePara();
                             newWord = false;
@@ -1441,7 +1463,7 @@ void DocParser::parse(const QString& source,
         location().warning(tr("Missing '\\%1'").arg(cmdName(CMD_ENDIF)));
     }
 
-    while (currentSectioningUnit > Doc::Chapter) {
+    while (currentSectioningUnit >= Doc::Chapter) {
         int delta = currentSectioningUnit - priv->extra->sectioningUnit;
         append(Atom::SectionRight, QString::number(delta));
         currentSectioningUnit = Doc::SectioningUnit(int(currentSectioningUnit) - 1);
@@ -1561,7 +1583,7 @@ void DocParser::insertTarget(const QString &target, bool keyword)
     }
 }
 
-void DocParser::include(const QString& fileName)
+void DocParser::include(const QString& fileName, const QString& identifier)
 {
     if (location().depth() > 16)
         location().fatal(tr("Too many nested '\\%1's")
@@ -1575,12 +1597,12 @@ void DocParser::include(const QString& fileName)
                                         fileName,
                                         userFriendlyFilePath);
     if (filePath.isEmpty()) {
-        location().warning(tr("Cannot find leaf file '%1'").arg(fileName));
+        location().warning(tr("Cannot find qdoc include file '%1'").arg(fileName));
     }
     else {
         QFile inFile(filePath);
         if (!inFile.open(QFile::ReadOnly)) {
-            location().warning(tr("Cannot open leaf file '%1'")
+            location().warning(tr("Cannot open qdoc include file '%1'")
                                 .arg(userFriendlyFilePath));
         }
         else {
@@ -1590,9 +1612,56 @@ void DocParser::include(const QString& fileName)
             QString includedStuff = inStream.readAll();
             inFile.close();
 
-            in.insert(pos, includedStuff);
-            len = in.length();
-            openedInputs.push(pos + includedStuff.length());
+            if (identifier.isEmpty()) {
+                in.insert(pos, includedStuff);
+                len = in.length();
+                openedInputs.push(pos + includedStuff.length());
+            }
+            else {
+                QStringList lineBuffer = includedStuff.split(QLatin1Char('\n'));
+                int i = 0;
+                int startLine = -1;
+                while (i < lineBuffer.size()) {
+                    if (lineBuffer[i].startsWith("//!")) {
+                        if (lineBuffer[i].contains(identifier)) {
+                            startLine = i+1;
+                            break;
+                        }
+                    }
+                    ++i;
+                }
+                if (startLine < 0) {
+                    location().warning(tr("Cannot find '%1' in '%2'")
+                                       .arg(identifier)
+                                       .arg(userFriendlyFilePath));
+                    return;
+                    
+                }
+                QString result;
+                i = startLine;
+                do {
+                    if (lineBuffer[i].startsWith("//!")) {
+                        if (i<lineBuffer.size()) {
+                            if (lineBuffer[i].contains(identifier)) {
+                                break;
+                            }
+                        }
+                    }
+                    else
+                        result += lineBuffer[i] + "\n";
+                    ++i;
+                } while (i < lineBuffer.size());
+                if (result.isEmpty()) {
+                    location().warning(tr("Empty qdoc snippet '%1' in '%2'")
+                                       .arg(identifier)
+                                       .arg(userFriendlyFilePath));
+                }
+                else {
+                    in.insert(pos, result);
+                    len = in.length();
+                    openedInputs.push(pos + result.length());
+                }
+            }
         }
     }
 }
@@ -1697,8 +1766,7 @@ bool DocParser::closeCommand(int endCmd)
             }
         }
         else {
-            location().warning(tr("Unexpected '\\%1'")
-                                .arg(cmdName(endCmd)));
+            location().warning(tr("Unexpected '\\%1'").arg(cmdName(endCmd)));
         }
         return false;
     }
@@ -1816,19 +1884,32 @@ void DocParser::parseAlso()
     }
 }
 
+//static bool debug = false;
+#if 0    
+    if (type == Atom::DivLeft)
+        debug = true;
+    if (debug)
+        qDebug() << type << string;
+    if (type == Atom::DivRight)
+        debug = false;
+#endif    
+
 void DocParser::append(Atom::Type type, const QString &string)
 {
     Atom::Type lastType = priv->text.lastAtom()->type();
-#ifdef QDOC_QML
-    if (((lastType == Atom::Code) || (lastType == Atom::Code)) &&
-#else        
-    if ((lastType == Atom::Code) &&
-#endif
-        priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
+    if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
         priv->text.lastAtom()->chopString();
     priv->text << Atom(type, string);
 }
 
+void DocParser::append(Atom::Type type, const QString& p1, const QString& p2)
+{
+    Atom::Type lastType = priv->text.lastAtom()->type();
+    if ((lastType == Atom::Code) && priv->text.lastAtom()->string().endsWith(QLatin1String("\n\n")))
+        priv->text.lastAtom()->chopString();
+    priv->text << Atom(type, p1, p2);
+}
+
 void DocParser::appendChar(QChar ch)
 {
     if (priv->text.lastAtom()->type() != Atom::String)
@@ -1883,20 +1964,23 @@ void DocParser::enterPara(Atom::Type leftType,
                           Atom::Type rightType,
                           const QString& string)
 {
-    if (paraState == OutsidePara) {
-        if (priv->text.lastAtom()->type() != Atom::ListItemLeft)
+    if (paraState == OutsideParagraph) {
+
+        if ((priv->text.lastAtom()->type() != Atom::ListItemLeft) &&
+            (priv->text.lastAtom()->type() != Atom::DivLeft)) {
             leaveValueList();
+        }
+
         append(leftType, string);
         indexStartedPara = false;
         pendingParaLeftType = leftType;
         pendingParaRightType = rightType;
         pendingParaString = string;
-        if (
-             leftType == Atom::SectionHeadingLeft) {
-            paraState = InsideSingleLinePara;
+        if (leftType == Atom::SectionHeadingLeft) {
+            paraState = InSingleLineParagraph;
         }
         else {
-            paraState = InsideMultiLinePara;
+            paraState = InMultiLineParagraph;
         }
         skipSpacesOrOneEndl();
     }
@@ -1904,7 +1988,7 @@ void DocParser::enterPara(Atom::Type leftType,
 
 void DocParser::leavePara()
 {
-    if (paraState != OutsidePara) {
+    if (paraState != OutsideParagraph) {
         if (!pendingFormats.isEmpty()) {
             location().warning(tr("Missing '}'"));
             pendingFormats.clear();
@@ -1920,7 +2004,7 @@ void DocParser::leavePara()
             }
             append(pendingParaRightType, pendingParaString);
         }
-        paraState = OutsidePara;
+        paraState = OutsideParagraph;
         indexStartedPara = false;
         pendingParaRightType = Atom::Nop;
         pendingParaString = "";
@@ -2154,10 +2238,8 @@ QString DocParser::getArgument(bool verbatim)
             location().warning(tr("Missing '}'"));
     }
     else {
-        while (pos < in.length() &&
-               ((delimDepth > 0) ||
-                ((delimDepth == 0) &&
-                 !in[pos].isSpace()))) {
+        while ((pos < in.length()) &&
+               ((delimDepth > 0) || ((delimDepth == 0) && !in[pos].isSpace()))) {
             switch (in[pos].unicode()) {
             case '(':
             case '[':
@@ -2362,6 +2444,9 @@ bool DocParser::isLeftBraceAhead()
     return numEndl < 2 && i < len && in[i] == '{';
 }
 
+/*!
+  Skips to the next non-space character or EOL.
+ */
 void DocParser::skipSpacesOnLine()
 {
     while ((pos < in.length()) &&
@@ -2370,6 +2455,9 @@ void DocParser::skipSpacesOnLine()
         ++pos;
 }
 
+/*!
+  Skips spaces and on EOL.
+ */
 void DocParser::skipSpacesOrOneEndl()
 {
     int firstEndl = -1;
@@ -2873,9 +2961,9 @@ const QList<Atom *> &Doc::targets() const
     return priv->extra->targets;
 }
 
-const QStringMap &Doc::metaTagMap() const
+const QStringMultiMap &Doc::metaTagMap() const
 {
-    return priv && priv->extra ? priv->extra->metaMap : *null_QStringMap();
+    return priv && priv->extra ? priv->extra->metaMap : *null_QStringMultiMap();
 }
 
 void Doc::initialize(const Config& config)
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h
index ea832b1..e043b3a 100644
--- a/tools/qdoc3/doc.h
+++ b/tools/qdoc3/doc.h
@@ -64,7 +64,6 @@ class FakeNode;
 
 typedef QMap<QString, QStringList> QCommandMap;
 typedef QMap<QString, QString> QStringMap;
-typedef QStringMap::const_iterator QStringMapEntry; 
 typedef QMultiMap<QString, QString> QStringMultiMap;
 
 class Doc
@@ -118,7 +117,7 @@ class Doc
     const QList<int> &tableOfContentsLevels() const;
     const QList<Atom *> &keywords() const;
     const QList<Atom *> &targets() const;
-    const QStringMap &metaTagMap() const;
+    const QStringMultiMap &metaTagMap() const;
 
     static void initialize( const Config &config );
     static void terminate();
diff --git a/tools/qdoc3/doc/config/compat.qdocconf b/tools/qdoc3/doc/config/compat.qdocconf
new file mode 100644
index 0000000..4b8d7a4
--- /dev/null
+++ b/tools/qdoc3/doc/config/compat.qdocconf
@@ -0,0 +1,28 @@
+macro.0                         = "\\\\0"
+macro.b                         = "\\\\b"
+macro.n                         = "\\\\n"
+macro.r                         = "\\\\r"
+macro.i                         = "\\o"
+macro.i11                       = "\\o{1,1}"
+macro.i12                       = "\\o{1,2}"
+macro.i13                       = "\\o{1,3}"
+macro.i14                       = "\\o{1,4}"
+macro.i15                       = "\\o{1,5}"
+macro.i16                       = "\\o{1,6}"
+macro.i17                       = "\\o{1,7}"
+macro.i18                       = "\\o{1,8}"
+macro.i19                       = "\\o{1,9}"
+macro.i21                       = "\\o{2,1}"
+macro.i31                       = "\\o{3,1}"
+macro.i41                       = "\\o{4,1}"
+macro.i51                       = "\\o{5,1}"
+macro.i61                       = "\\o{6,1}"
+macro.i71                       = "\\o{7,1}"
+macro.i81                       = "\\o{8,1}"
+macro.i91                       = "\\o{9,1}"
+macro.img                       = "\\image"
+macro.endquote                  = "\\endquotation"
+macro.relatesto                 = "\\relates"
+
+spurious                        = "Missing comma in .*" \
+                                  "Missing pattern .*"
diff --git a/tools/qdoc3/doc/config/macros.qdocconf b/tools/qdoc3/doc/config/macros.qdocconf
new file mode 100644
index 0000000..2262daa
--- /dev/null
+++ b/tools/qdoc3/doc/config/macros.qdocconf
@@ -0,0 +1,37 @@
+macro.aacute.HTML       = "&aacute;"
+macro.Aring.HTML        = "&Aring;"
+macro.aring.HTML        = "&aring;"
+macro.Auml.HTML         = "&Auml;"
+macro.author            = "\\bold{Author:}"
+macro.br.HTML           = "<br />"
+macro.BR.HTML           = "<br />"
+macro.copyright.HTML    = "&copy;"
+macro.eacute.HTML       = "&eacute;"
+macro.gui               = "\\bold"
+macro.hr.HTML           = "<hr />"
+macro.iacute.HTML       = "&iacute;"
+macro.key               = "\\bold"
+macro.menu              = "\\bold"
+macro.note              = "\\bold{Note:}"
+macro.oslash.HTML       = "&oslash;"
+macro.ouml.HTML         = "&ouml;"
+macro.QA                = "\\e{Qt Assistant}"
+macro.QD                = "\\e{Qt Designer}"
+macro.QL                = "\\e{Qt Linguist}"
+macro.QQV               = "\\e{Qt QML Viewer}"
+macro.param             = "\\e"
+macro.raisedaster.HTML  = "<sup>*</sup>"
+macro.rarrow.HTML       = "&rarr;"
+macro.reg.HTML          = "<sup>&reg;</sup>"
+macro.return            = "Returns"
+macro.starslash         = "\\c{*/}"
+macro.begincomment      = "\\c{/*}"
+macro.endcomment        = "\\c{*/}"
+macro.uuml.HTML         = "&uuml;"
+macro.mdash.HTML        = "&mdash;"
+
+macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
+macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
+macro.endfloat.HTML         = "</div>"
+macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
+macro.emptyspan.HTML	    = "<span></span>"
diff --git a/tools/qdoc3/doc/config/qdoc-online.qdocconf b/tools/qdoc3/doc/config/qdoc-online.qdocconf
new file mode 100644
index 0000000..7fd8ed5
--- /dev/null
+++ b/tools/qdoc3/doc/config/qdoc-online.qdocconf
@@ -0,0 +1,2 @@
+include(qdoc-project.qdocconf)
+include(qt-html-templates-online.qdocconf)
diff --git a/tools/qdoc3/doc/config/qdoc-project.qdocconf b/tools/qdoc3/doc/config/qdoc-project.qdocconf
new file mode 100644
index 0000000..9694052
--- /dev/null
+++ b/tools/qdoc3/doc/config/qdoc-project.qdocconf
@@ -0,0 +1,47 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-defines.qdocconf)
+
+indexes = $$QT_BUILD_TREE/doc/html/qt.index
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+
+project          = QDoc
+description      = QDoc3 Manual
+url = http://doc.qt.nokia.com/qdoc
+
+sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
+headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
+examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
+
+sourcedirs = ..
+
+exampledirs = .. \
+              ../examples \
+              ../../../../examples
+
+imagedirs = ../../../doc/src/templates/images \
+            images
+
+outputdir = $$QT_BUILD_TREE/tools/qdoc3/doc/html
+tagfile = $$QT_BUILD_TREE/tools/qdoc3/doc/html/qdoc.tags
+
+qhp.projects            = QDoc
+
+qhp.QDoc.file                = qdoc.qhp
+qhp.QDoc.namespace           = com.trolltech.qdoc
+qhp.QDoc.virtualFolder       = qdoc
+qhp.QDoc.indexTitle          = QDoc Manual - Table of Contents
+qhp.QDoc.indexRoot           =
+
+qhp.QDoc.filterAttributes    = qdoc qtrefdoc
+qhp.QDoc.customFilters.QDoc.name = QDoc
+qhp.QDoc.customFilters.QDoc.filterAttributes = qdoc
+qhp.QDoc.subprojects         = overviews
+qhp.QDoc.subprojects.overviews.title = Overviews
+qhp.QDoc.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QDoc.subprojects.overviews.selectors = fake:page,group,module
diff --git a/tools/qdoc3/doc/config/qdoc.qdocconf b/tools/qdoc3/doc/config/qdoc.qdocconf
new file mode 100644
index 0000000..c238abe
--- /dev/null
+++ b/tools/qdoc3/doc/config/qdoc.qdocconf
@@ -0,0 +1,2 @@
+include(qdoc-project.qdocconf)
+include(qt-html-templates.qdocconf)
diff --git a/tools/qdoc3/doc/config/qt-cpp-ignore.qdocconf b/tools/qdoc3/doc/config/qt-cpp-ignore.qdocconf
new file mode 100644
index 0000000..044eef4
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-cpp-ignore.qdocconf
@@ -0,0 +1,98 @@
+Cpp.ignoretokens        = QAXFACTORY_EXPORT \
+                          QDESIGNER_COMPONENTS_LIBRARY \
+                          QDESIGNER_EXTENSION_LIBRARY \
+                          QDESIGNER_SDK_LIBRARY \
+                          QDESIGNER_SHARED_LIBRARY \
+                          QDESIGNER_UILIB_LIBRARY \
+                          QM_EXPORT_CANVAS \
+                          QM_EXPORT_DNS \
+                          QM_EXPORT_DOM \
+                          QM_EXPORT_FTP \
+                          QM_EXPORT_HTTP \
+                          QM_EXPORT_ICONVIEW \
+                          QM_EXPORT_NETWORK \
+                          QM_EXPORT_OPENGL \
+                          QM_EXPORT_OPENVG \
+                          QM_EXPORT_SQL \
+                          QM_EXPORT_TABLE \
+                          QM_EXPORT_WORKSPACE \
+                          QM_EXPORT_XML \
+                          QT_ASCII_CAST_WARN \
+                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
+                          QT_BEGIN_HEADER \
+                          QT_DESIGNER_STATIC \
+                          QT_END_HEADER \
+                          QT_FASTCALL \
+                          QT_WIDGET_PLUGIN_EXPORT \
+                          Q_COMPAT_EXPORT \
+                          Q_CORE_EXPORT \
+                          Q_CORE_EXPORT_INLINE \
+                          Q_EXPLICIT \
+                          Q_EXPORT \
+                          Q_EXPORT_CODECS_CN \
+                          Q_EXPORT_CODECS_JP \
+                          Q_EXPORT_CODECS_KR \
+                          Q_EXPORT_PLUGIN \
+                          Q_GFX_INLINE \
+                          Q_AUTOTEST_EXPORT \
+                          Q_GUI_EXPORT \
+                          Q_GUI_EXPORT_INLINE \
+                          Q_GUI_EXPORT_STYLE_CDE \
+                          Q_GUI_EXPORT_STYLE_COMPACT \
+                          Q_GUI_EXPORT_STYLE_MAC \
+                          Q_GUI_EXPORT_STYLE_MOTIF \
+                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
+                          Q_GUI_EXPORT_STYLE_PLATINUM \
+                          Q_GUI_EXPORT_STYLE_POCKETPC \
+                          Q_GUI_EXPORT_STYLE_SGI \
+                          Q_GUI_EXPORT_STYLE_WINDOWS \
+                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
+                          QHELP_EXPORT \
+                          Q_INLINE_TEMPLATE \
+                          Q_INTERNAL_WIN_NO_THROW \
+                          Q_NETWORK_EXPORT \
+                          Q_OPENGL_EXPORT \
+                          Q_OPENVG_EXPORT \
+                          Q_OUTOFLINE_TEMPLATE \
+                          Q_SQL_EXPORT \
+                          Q_SVG_EXPORT \
+                          Q_SCRIPT_EXPORT \
+                          Q_SCRIPTTOOLS_EXPORT \
+                          Q_TESTLIB_EXPORT \
+                          Q_TYPENAME \
+                          Q_XML_EXPORT \
+                          Q_XMLSTREAM_EXPORT \
+                          Q_XMLPATTERNS_EXPORT \
+                          QDBUS_EXPORT \
+                          Q_DBUS_EXPORT \
+                          QT_BEGIN_NAMESPACE \
+                          QT_BEGIN_INCLUDE_NAMESPACE \
+                          QT_END_NAMESPACE \
+                          QT_END_INCLUDE_NAMESPACE \
+                          PHONON_EXPORT \
+                          Q_DECLARATIVE_EXPORT \
+                          Q_GADGET \
+                          QWEBKIT_EXPORT \
+                          Q_INVOKABLE
+Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
+                          Q_DECLARE_INTERFACE \
+                          Q_DECLARE_METATYPE \
+                          Q_DECLARE_OPERATORS_FOR_FLAGS \
+                          Q_DECLARE_PRIVATE \
+                          Q_DECLARE_PUBLIC \
+                          Q_DECLARE_SHARED \
+                          Q_DECLARE_TR_FUNCTIONS \
+                          Q_DECLARE_TYPEINFO \
+                          Q_DISABLE_COPY \
+                          QT_FORWARD_DECLARE_CLASS \
+                          Q_DUMMY_COMPARISON_OPERATOR \
+                          Q_ENUMS \
+                          Q_FLAGS \
+                          Q_INTERFACES \
+                          __attribute__ \
+                          K_DECLARE_PRIVATE \
+                          PHONON_OBJECT \
+                          PHONON_HEIR \
+                          Q_PRIVATE_PROPERTY \
+                          Q_DECLARE_PRIVATE_D \
+                          Q_CLASSINFO
diff --git a/tools/qdoc3/doc/config/qt-defines.qdocconf b/tools/qdoc3/doc/config/qt-defines.qdocconf
new file mode 100644
index 0000000..50a355f
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-defines.qdocconf
@@ -0,0 +1,17 @@
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT_NO_EGL \
+                          QT3_SUPPORT \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
diff --git a/tools/qdoc3/doc/config/qt-html-default-styles.qdocconf b/tools/qdoc3/doc/config/qt-html-default-styles.qdocconf
new file mode 100644
index 0000000..47e550b
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-html-default-styles.qdocconf
@@ -0,0 +1,32 @@
+# Define the location of the templates to use. Style sheets and scripts are
+# specified relative to the template directory and will be copied into
+# subdirectories of the output directory.
+
+HTML.templatedir = .
+
+HTML.stylesheets = style/offline.css
+
+HTML.scripts     =
+
+# Files not referenced in any qdoc file (last four needed by qtdemo)
+# See also qhp.Qt.extraFiles
+extraimages.HTML        = qt-logo.png \
+                          arrow_down.png \
+                          breadcrumb.png \
+                          bullet_gt.png \
+                          bullet_dn.png \
+                          bullet_sq.png \
+                          bullet_up.png \
+                          horBar.png \
+                          sprites-combined.png
+    
+# Include the style sheets and scripts used.
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.headerscripts = 
+
+HTML.endheader = \
+    "</head>\n" \
+    "<body>\n"
diff --git a/tools/qdoc3/doc/config/qt-html-online-styles.qdocconf b/tools/qdoc3/doc/config/qt-html-online-styles.qdocconf
new file mode 100644
index 0000000..f915cb4
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-html-online-styles.qdocconf
@@ -0,0 +1,72 @@
+# Define the location of the templates to use. Style sheets and scripts are
+# specified relative to the template directory and will be copied into
+# subdirectories of the output directory.
+
+HTML.templatedir = .
+
+HTML.stylesheets = style/narrow.css \
+                   style/style.css \
+                   style/style_ie6.css \
+                   style/style_ie7.css \
+                   style/style_ie8.css \
+                   style/superfish.css
+
+# Adding jquery and functions - providing online tools and search features
+HTML.scripts     = scripts/functions.js \
+                   scripts/narrow.js \
+                   scripts/superfish.js \
+                   scripts/jquery.js
+
+
+# Files not referenced in any qdoc file.
+# See also qhp.Qt.extraFiles
+extraimages.HTML        = qt-logo.png \
+                          bg_l.png \
+                          bg_l_blank.png \
+                          bg_ll_blank.png \
+                          bg_ul_blank.png \
+                          header_bg.png \
+                          bg_r.png \
+                          box_bg.png \
+                          breadcrumb.png \
+                          bullet_gt.png \
+                          bullet_dn.png \
+                          bullet_sq.png \
+                          bullet_up.png \
+                          arrow_down.png \
+                          feedbackground.png \
+                          horBar.png \
+                          page.png \
+                          page_bg.png \
+                          sprites-combined.png \
+                          spinner.gif
+    
+# Include the style sheets and scripts used.
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n" \
+    "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n" \
+    "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />\n" \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n" \
+    "  <!--[if IE]>\n" \
+    "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n" \
+    "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if lt IE 7]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if IE 7]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if IE 8]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n" \
+    "<![endif]-->\n\n"
+
+HTML.headerscripts = \
+    "<script src=\"scripts/superfish.js\" type=\"text/javascript\"></script>\n" \
+    "<script src=\"scripts/narrow.js\" type=\"text/javascript\"></script>\n\n"
+
+HTML.endheader = \
+    "</head>\n" \
+    "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"
diff --git a/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf b/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf
new file mode 100644
index 0000000..cbf8851
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf
@@ -0,0 +1,115 @@
+include(qt-html-online-styles.qdocconf)
+
+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>QDoc Reference Documentation</span></a>\n" \
+    "    <div id=\"narrowsearch\"></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" \
+    "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
+    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+    "          DOC</a></li>\n" \
+    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+    "      </ul>\n" \
+    "    </div>\n" \
+    "    <div id=\"shortCut\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
+    "        </a></li>\n" \
+    "      </ul>\n" \
+    "     </div>\n" \
+    "    </div>\n" \
+    "  </div>\n" \
+    "  <div class=\"wrapper\">\n" \
+    "    <div class=\"hd\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "    <div class=\"bd group\">\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "              <!--  Breadcrumbs go here -->\n"
+
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\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" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "        </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content mainContent\">\n"
+
+HTML.footer = \
+    "      </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-2011 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n"
+
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.QDoc.extraFiles = index.html \
+                      images/bg_l.png \
+                      images/bg_l_blank.png \
+                      images/bg_ll_blank.png \
+                      images/bg_ul_blank.png \
+                      images/header_bg.png \
+                      images/bg_r.png \
+                      images/box_bg.png \
+                      images/breadcrumb.png \
+                      images/bullet_gt.png \
+                      images/bullet_dn.png \
+                      images/bullet_sq.png \
+                      images/bullet_up.png \
+                      images/arrow_down.png \
+                      images/feedbackground.png \
+                      images/horBar.png \
+                      images/page.png \
+                      images/page_bg.png \
+                      images/sprites-combined.png \
+                      images/spinner.gif \
+                      scripts/functions.js \
+                      scripts/jquery.js \
+                      scripts/narrow.js \
+                      scripts/superfish.js \
+                      style/narrow.css \
+                      style/superfish.css \
+                      style/style_ie6.css \
+                      style/style_ie7.css \
+                      style/style_ie8.css \
+                      style/style.css
diff --git a/tools/qdoc3/doc/config/qt-html-templates.qdocconf b/tools/qdoc3/doc/config/qt-html-templates.qdocconf
new file mode 100644
index 0000000..e0dc875
--- /dev/null
+++ b/tools/qdoc3/doc/config/qt-html-templates.qdocconf
@@ -0,0 +1,54 @@
+include(qt-html-default-styles.qdocconf)
+
+HTML.postheader = \
+    "<div class=\"header\" id=\"qtdocheader\">\n" \
+    "  <div class=\"content\"> \n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "  </div>\n" \
+    "  <div class=\"breadcrumb toolblock\">\n" \
+    "    <ul>\n" \
+    "      <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "      <!--  Breadcrumbs go here -->\n"
+
+HTML.postpostheader = \
+    "    </ul>\n" \
+    "  </div>\n" \
+    "</div>\n" \
+    "<div class=\"content mainContent\">\n"
+
+HTML.footer = \
+    "  <div class=\"ft\">\n" \
+    "    <span></span>\n" \
+    "  </div>\n" \
+    "</div> \n" \
+    "<div class=\"footer\">\n" \
+    "  <p>\n" \
+    "     <acronym title=\"Copyright\">&copy;</acronym> 2008-2011 Nokia Corporation and/or its\n" \
+    "     subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "     in Finland and/or other countries worldwide.</p>\n" \
+    "  <p>\n" \
+    "     All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "     href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "  <br />\n" \
+    "  <p>\n" \
+    "    Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "    Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "    with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "  <p>\n" \
+    "    Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "    Free Documentation License version 1.3</a>\n" \
+    "    as published by the Free Software Foundation.</p>\n" \
+    "</div>\n" \
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.QDoc.extraFiles = index.html \
+                      images/arrow_down.png \
+                      images/breadcrumb.png \
+                      images/bullet_gt.png \
+                      images/bullet_dn.png \
+                      images/bullet_sq.png \
+                      images/bullet_up.png \
+                      images/horBar.png \
+                      images/sprites-combined.png \
+                      style/offline.css
diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js
new file mode 100755
index 0000000..62bc535
--- /dev/null
+++ b/tools/qdoc3/doc/config/scripts/functions.js
@@ -0,0 +1,258 @@
+// Removing search results
+function hideSearchResults() {
+/* hiding search results as the user clicks on the different categories */
+  $('#resultdialog').removeClass('active');
+	$("#resultlist").removeClass().addClass('all');
+	$("#resultlinks").removeClass().addClass('all');
+	$("#searchcount").removeClass().addClass('all');
+}
+/* closing the searhc result dialog */
+$('#resultclose').click(function(e) {
+  e.preventDefault();
+  hideSearchResults();
+});
+
+$(document.body).click(function() {
+});
+
+/* START non link areas where cursor should change to pointing hand */
+$('.t_button').mouseover(function() {
+    $('.t_button').css('cursor','pointer');
+});
+/* END non link areas  */
+/* Changing font size to smaller */
+$('#smallA').click(function() {
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','smaller');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+
+/* Reset font size */
+$('#medA').click(function() {
+		$('.mainContent .heading').css('font','600 16px/1 Arial');
+		$('.mainContent h1').css('font','600 18px/1.2 Arial');
+		$('.mainContent h2').css('font','600 16px/1.2 Arial');
+		$('.mainContent h3').css('font','600 14px/1.2 Arial');
+		$('.mainContent p').css('font','13px/20px Verdana');
+		$('.mainContent li').css('font','400 13px/1 Verdana');
+		$('.mainContent li').css('line-height','14px');
+		$('.mainContent .toc li').css('font', 'normal 10px/1.2 Verdana');
+		$('.mainContent table').css('font','13px/1.2 Verdana');
+		$('.mainContent .heading').css('font','600 16px/1 Arial');
+		$('.mainContent .indexboxcont li').css('font','600 13px/1 Verdana');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+/* Changing font size to bigger */
+$('#bigA').click(function() {
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('font-size','large');
+		$('.mainContent .heading,.mainContent h1, .mainContent h2, .mainContent h3, .mainContent p, .mainContent li, .mainContent table').css('line-height','25px');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+
+/* Show page content after closing feedback box */
+$('.feedclose').click(function() {
+	$('.bd').show();
+	$('.hd').show();
+	$('.footer').show();
+	$('#feedbackBox').hide();
+	$('#blurpage').hide();
+});
+
+/* Hide page content and show feedback box */
+$('.feedback').click(function() {
+	$('.bd').hide();
+	$('.hd').hide();
+	$('.footer').hide();
+	$('#feedbackBox').show();
+	$('#blurpage').show();
+});
+/* Default search URL */
+var qturl = "";
+
+/* The next function handles the response data (in xml) returned by the search engine */
+
+// Process data sent back from the server. The data is structured as a XML.
+/*
+XML structure handled by function processNokiaData()
+<page> - container for each page returned
+<pageWords/> - contains keywords
+<pageTitle/> - contains page title/header content 
+<pageUrl/> - contains page URL - URL relative to root
+<pageType> - contains page type - APIPage/Article/Example
+</page>
+*/
+
+
+function processNokiaData(response){
+/* fetch the responce from the server using page as the root element */
+	var propertyTags = response.getElementsByTagName('page');
+	/* reset counters */	
+	var apiCount = 0;
+	var articleCount = 0;
+	var exampleCount = 0;
+	var full_li_element;
+
+/* remove any old results */
+	$('#resultlist li').remove();
+
+
+	/* running through the elements in the xml structure */
+ 	for (var i=0; i<propertyTags.length; i++) {
+		/* for every element named pageWords*/
+		for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++) {
+			/* start a new list element */
+			full_li_element = '<li';
+					/* if the pageType element reads APIPage, add class name api */
+      if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
+      	full_li_element += ' class="api"';
+      	apiCount++;
+      }
+					/* if the pageType element reads Article, add class name article */
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
+      	full_li_element += ' class="article"';
+      	articleCount++;
+      }
+					/* if the pageType element reads Example, add class name example */
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
+      	full_li_element += ' class="example"';
+      	exampleCount++;
+      }
+			/* adding the link element*/
+			full_li_element += '><a href="'+qturl;
+			/* adding the URL attribute*/
+			full_li_element += propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+      		/* adding the link title and closing the link and list elements */
+			full_li_element += '">' + propertyTags[i].getElementsByTagName('pageWords')[0].firstChild.nodeValue + '</a></li>';
+			/* appending the list element to the #resultlist div*/
+			$('#resultlist').append(full_li_element);
+		}
+	}
+
+	/* if the result is not empty */
+	if (propertyTags.length > 0) {
+	/* add class name active to show the dialog */
+	  $('#resultdialog').addClass('active');
+	  /* setting number of hits*/
+	  $('#resultcount').html(propertyTags.length);
+	  $('#apicount').html(apiCount);
+	  $('#articlecount').html(articleCount);
+	  $('#examplecount').html(exampleCount);
+	  
+	}
+	else {
+	  $('#pageType').addClass('red');
+	  }
+  
+
+
+  // Filtering results in display
+	$('p#resultlinks a').click(function(e) {
+  	e.preventDefault();
+	// Displays API ref pages
+		if (this.id == "showapiresults") {
+			$("#resultlist").removeClass().addClass('api');
+			$("#resultlinks").removeClass().addClass('api');
+			$("#searchcount").removeClass().addClass('api');
+		}
+	// Displays Articles
+		else if (this.id == "showarticleresults") {
+			$("#resultlist").removeClass().addClass('article');
+			$("#resultlinks").removeClass().addClass('article');
+			$("#searchcount").removeClass().addClass('article');
+		}
+	// Displays Examples
+		if (this.id == "showexampleresults") {
+			$("#resultlist").removeClass().addClass('example');
+			$("#resultlinks").removeClass().addClass('example');
+			$("#searchcount").removeClass().addClass('example');
+		}
+	// Displays All
+		if (this.id == "showallresults") {
+			$("#resultlist").removeClass().addClass('all');
+			$("#resultlinks").removeClass().addClass('all');
+			$("#searchcount").removeClass().addClass('all');
+		}
+	});
+}
+
+//build regular expression object to find empty string or any number of blank
+var blankRE=/^\s*$/;
+
+
+function CheckEmptyAndLoadList()
+{
+	/* Start Extracting information for feedback and adding this to the feedback form */
+	var pageUrl = window.location.href;
+	var pageVal = $('title').html();
+	$('#pageType').removeClass('red');
+	$('#feedUrl').remove();
+	$('#pageVal').remove();
+	$('.menuAlert').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;">');
+	/* End Extracting information for feedback and adding this to the feedback form */
+
+	/* extracts search query */
+	var value = document.getElementById('pageType').value; 
+	/* if the search is less than three chars long remove class names and remove elements from old search*/
+	if((blankRE.test(value)) || (value.length < 3))
+	{
+	$('#resultdialog').removeClass('active');
+	$('#resultlist li').remove();
+	}
+}
+
+// Loads on doc ready - prepares search 
+	$(document).ready(function () {
+	/* fetch page title*/ 
+	var pageTitle = $('title').html();
+	/* getting content from search box */
+          var currentString = $('#pageType').val() ;
+	  /* if the search box is not empty run CheckEmptyAndLoadList*/
+		  if(currentString.length < 1){
+      	   		CheckEmptyAndLoadList();			
+		  }
+
+		/* on key-up in the search box execute the following */
+        $('#pageType').keyup(function () {
+		/* extract the search box content */
+          var searchString = $('#pageType').val() ;
+	  /* if the string is less than three characters */
+          if ((searchString == null) || (searchString.length < 3)) {
+			/* remove classes and elements*/
+				$('#pageType').removeClass('loading');
+				 $('.searching').remove(); 
+			/*  run CheckEmptyAndLoadList */
+      	   		CheckEmptyAndLoadList();
+
+				$('.report').remove();
+				return;
+		   }
+	   /* if timer checks out */
+            if (this.timer) clearTimeout(this.timer);
+            this.timer = setTimeout(function () {
+			/* add loading image by adding loading class */
+				$('#pageType').addClass('loading');
+				$('.searching').remove(); 
+
+			/* run the actual search */
+               $.ajax({
+                contentType: "application/x-www-form-urlencoded",
+                url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
+                data: 'searchString='+searchString,
+                dataType:'xml',
+				type: 'post',	 
+                success: function (response, textStatus) {
+				/* on success remove loading img */
+				$('.searching').remove(); 
+				$('#pageType').removeClass('loading');
+
+                processNokiaData(response);
+
+ }     
+              });
+            }, 500); /* timer set to 500 ms */
+        });
+      }); 
\ No newline at end of file
diff --git a/tools/qdoc3/doc/config/scripts/jquery.js b/tools/qdoc3/doc/config/scripts/jquery.js
new file mode 100755
index 0000000..0c7294c
--- /dev/null
+++ b/tools/qdoc3/doc/config/scripts/jquery.js
@@ -0,0 +1,152 @@
+/*!
+ * jQuery JavaScript Library v1.4.1
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Mon Jan 25 19:43:33 2010 -0500
+ */
+(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j?
+e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if(!(a.button&&a.type==="click")){for(o in x){j=x[o];if(j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f,
+a.currentTarget);m=0;for(s=i.length;m<s;m++)for(o in x){j=x[o];n=i[m].elem;f=null;if(i[m].selector===j.selector){if(j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if(!f||f!==n)d.push({elem:n,fn:j})}}m=0;for(s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if(i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType===
+11}function qa(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var i in f)for(var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if(i=c.fragments[a[0]])if(i!==1)f=i}if(!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment();
+c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent,
+va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]],
+[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a,
+this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this,
+a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};
+c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(i in e){j=a[i];n=e[i];if(a!==n)if(f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if(n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$=
+Oa;if(a)z.jQuery=Na;return c},isReady:false,ready:function(){if(!c.isReady){if(!r.body)return setTimeout(c.ready,13);c.isReady=true;if(P){for(var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if(!va){va=true;if(r.readyState==="complete")return c.ready();if(r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if(r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload",
+c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for(b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;
+return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]||
+r.documentElement,d=r.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if(d)if(j)for(f in a){if(b.apply(a[f],d)===false)break}else for(;e<i;){if(b.apply(a[e++],d)===false)break}else if(j)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=
+a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==
+v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=v}else if(b&&!c.isFunction(b)){d=b;b=v}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},
+uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if(O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if(c.browser.webkit)c.browser.safari=true;if(wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if(r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded",
+L,false);c.ready()};else if(r.attachEvent)L=function(){if(r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support=
+{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};
+b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild);
+c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props=
+{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true,
+{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);
+return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||
+a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=
+c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className)for(var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if(i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string"||a===v)for(var b=(a||"").split(ca),
+d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,i=0,j=c(this),n=b,o=
+a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||
+{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i<d;i++){var j=e[i];if(j.selected){a=c(j).val();if(b)return a;f.push(a)}}return f}if(za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if(this.nodeType===1){if(n)s=a.call(this,o,m.val());
+if(typeof s==="number")s+="";if(c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d);
+f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=
+""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j=
+function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a,
+d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+
+s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a,
+"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,
+b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b,
+d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b=
+0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};
+c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b=
+a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this,
+"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"||
+d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a=
+a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,
+f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a,
+b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+
+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if(c.isFunction(f)){e=f;f=v}for(d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector,
+live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g){for(var h="",k,l=0;g[l];l++){k=g[l];if(k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if(k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===k){y=l[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===
+k){y=l[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=k;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||
+typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u=
+l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&
+y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if(!g)return[];for(var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if(q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q,
+h,k);if(l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for(var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for(var H in m.filter)if((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(u===p)p=[];if(m.preFilter[H])if(t=m.preFilter[H](t,u,k,p,l,R)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=u[U])!=null;U++)if(D){I=M(D,t,U,u);var Da=
+l^!!I;if(k&&I!=null)if(Da)y=true;else u[U]=false;else if(Da){p.push(D);y=true}}if(I!==v){k||(u=p);g=g.replace(m.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if(l)h=h.toLowerCase();l=0;for(var q=g.length,
+p;l<q;l++)if(p=g[l]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l<q;l++){var p=g[l];if(p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for(q=g.length;l<q;l++)if(p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=
+h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if(typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for(var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}},
+TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var u;(u=h[p])!=null;p++)if(u)if(q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&
+"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);
+return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===
+g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2===
+0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k<l;k++)if(h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+
+q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for(;l=l.previousSibling;)if(l.nodeType===1)return false;if(k==="first")return true;l=g;case "last":for(;l=l.nextSibling;)if(l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if(k===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for(l=p.firstChild;l;l=l.nextSibling)if(l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>=
+0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="?
+k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};
+try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k<l;k++)h.push(g[k]);else for(k=0;g[k];k++)h.push(g[k]);return h}}var C;if(r.documentElement.compareDocumentPosition)C=function(g,h){if(!g.compareDocumentPosition||!h.compareDocumentPosition){if(g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===
+h?0:1;if(g===0)j=true;return g};else if("sourceIndex"in r.documentElement)C=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)j=true;return g};else if(r.createRange)C=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END,
+l);if(g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id");
+return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href",
+2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===
+0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[],
+l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if(b.nodeType)return c.grep(a,
+function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if(f>0)for(var i=d;i<b.length;i++)for(var j=0;j<d;j++)if(b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=
+0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for(;f&&f.ownerDocument&&f!==b;){for(j in i){e=i[j];if(e.jquery?e.index(f)>
+-1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),
+a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},
+nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):
+e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==
+b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],
+col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)},
+wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?
+d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,
+false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&
+!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)||
+["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,
+b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if(!c.support.checkClone&&arguments.length===3&&typeof j===
+"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if(this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if(i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for(var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n,
+Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for(var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if(!a||c.filter(a,[this]).length){if(!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&&
+this.parentNode.removeChild(this)}},empty:function(){for(this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if(typeof j==="number")j+="";if(j){if(typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if(typeof j===
+"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for(i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if(!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for(o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild);
+j=c.makeArray(i.childNodes)}if(j.nodeType)e.push(j);else e=c.merge(e,j)}});if(d)for(a=0;e[a];a++)if(f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for(var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i,
+Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===v)return c.curCSS(d,f);if(typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})};
+c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return v;if((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if(ga.test(b))b=La;b=b.replace(ha,ia);if(e)f[b]=d;return f[b]},css:function(a,
+b,d,f){if(b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&
+a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ga.test(b))b=La;if(!d&&e&&e[b])f=e[b];else if(ob){if(ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if(!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left=
+a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb=
+J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if(typeof a!=="string")return this._load(a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=
+c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if(n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&
+(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,
+b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}:
+function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}
+function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||
+N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if(e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if(e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&
+c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if(e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if(e.scriptCharset)B.charset=e.scriptCharset;if(!i){var C=false;B.onload=B.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&&
+A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if(w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if(e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",
+e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if(e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if(!w||w.readyState===0||q==="abort"){E||d();E=true;if(w)w.onreadystatechange=c.noop}else if(!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)?
+"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if(j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if(j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if(e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e,
+w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=
+f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if(c.isArray(n))c.each(n,
+function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if(b===v)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/,
+W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();
+ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&
+c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"),
+o=this;for(j in a){var m=j.replace(ha,ia);if(j!==m){a[m]=a[j];delete a[j];j=m}if(a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if(c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if(i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if(wb.test(x))A[x==="toggle"?n?"show":"hide":x](a);
+else{var B=xb.exec(x),C=A.cur(true)||0;if(B){x=parseFloat(B[2]);var E=B[3]||"px";if(E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if(B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",
+1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,
+b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==
+null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop===
+"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=
+this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=
+c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=
+null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),
+f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(s){c.offset.setOffset(this,a,s)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=
+b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if(b===d){o+=b.offsetTop;m+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)||
+0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if(f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if(c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"),
+d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);
+d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop},
+bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left-
+e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=
+this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if(!e)return null;if(f!==v)return this.each(function(){if(i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}});
+c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||
+e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window);
diff --git a/tools/qdoc3/doc/config/scripts/narrow.js b/tools/qdoc3/doc/config/scripts/narrow.js
new file mode 100644
index 0000000..a5e8b97
--- /dev/null
+++ b/tools/qdoc3/doc/config/scripts/narrow.js
@@ -0,0 +1,133 @@
+/* This function generates menus and search box in narrow/slim fit mode */
+var narrowInit = function() {
+  /* 1: Create search form */ 
+  var narrowSearch = $('<div id="narrowsearch"></div>');
+  var searchform = $("#qtdocsearch");
+  narrowSearch.append(searchform);
+  $("#qtdocheader .content .qtref").after(narrowSearch);
+
+  /* 2: Create dropdowns */ 
+  var narrowmenu = $('<ul id="narrowmenu" class="sf-menu"></ul>');
+
+  /* Lookup */ 
+  var lookuptext = $("#lookup h2").attr("title");
+  $("#lookup ul").removeAttr("id");
+  $("#lookup ul li").removeAttr("class");
+  $("#lookup ul li").removeAttr("style");
+  var lookupul = $("#lookup ul");
+  var lookuplist = $('<li></li>');
+  var lookuplink = $('<a href="#"></a>');
+  lookuplink.append(lookuptext);
+  lookuplist.append(lookuplink);
+  lookuplist.append(lookupul);
+  narrowmenu.append(lookuplist);
+
+  /* Topics */ 
+  var topicstext = $("#topics h2").attr("title");
+  $("#topics ul").removeAttr("id");
+  $("#topics ul li").removeAttr("class");
+  $("#topics ul li").removeAttr("style");
+  var topicsul = $("#topics ul");
+  var topicslist = $('<li></li>');
+  var topicslink = $('<a href="#"></a>');
+  topicslink.append(topicstext);
+  topicslist.append(topicslink);
+  topicslist.append(topicsul);
+  narrowmenu.append(topicslist);
+
+  /* Examples */ 
+  var examplestext = $("#examples h2").attr("title");
+  $("#examples ul").removeAttr("id");
+  $("#examples ul li").removeAttr("class");
+  $("#examples ul li").removeAttr("style");
+  var examplesul = $("#examples ul");
+  var exampleslist = $('<li></li>');
+  var exampleslink = $('<a href="#"></a>');
+  exampleslink.append(examplestext);
+  exampleslist.append(exampleslink);
+  exampleslist.append(examplesul);
+  narrowmenu.append(exampleslist);
+
+  $("#shortCut").after(narrowmenu);
+  $('ul#narrowmenu').superfish({
+    delay: 100,
+    autoArrows: false,
+    disableHI: true
+  });
+}
+
+/* Executes on doc ready */
+$(document).ready(function(){
+	/* check if body has the narrow class */
+	if ($('body').hasClass('narrow')) {
+		/* run narrowInit */
+		narrowInit();
+	}
+ 
+	/* messure window width and add class if it is smaller than 600 px */
+	if($(window).width()<600) {
+		$('body').addClass('narrow');
+		/* if the search box contains */
+		if ($("#narrowsearch").length == 0) {
+			/* run narrowInit */
+			narrowInit();
+		}
+	  }
+	  else { /* if the window is wider than 600 px, narrow is removed */
+		$('body').removeClass('narrow');
+		if ($("#narrowsearch").length == 0) {
+		}
+	}
+});
+/* binding resize event to this funciton */
+$(window).bind('resize', function () {
+	/*  if the window is wider than 600 px, narrow class is added */
+	if($(window).width()<600) {
+		$('body').addClass('narrow');
+		if ($("#narrowsearch").length == 0) {
+		  narrowInit();
+		}
+	}
+	else {
+		/* else we remove the narrow class */
+		$('body').removeClass('narrow');
+  }
+});
+
+	$('#narrowsearch').keyup(function () {
+		/* extract the search box content */
+	  var searchString = $('#narrowsearch').val();
+	  /* if the string is less than three characters */
+	  if ((searchString == null) || (searchString.length < 3)) {
+			/* remove classes and elements*/
+			$('#narrowsearch').removeClass('loading');
+			$('.searching').remove(); 
+			/*  run CheckEmptyAndLoadList */
+			CheckEmptyAndLoadList();
+			
+			$('.report').remove();
+			return;
+	   }
+	   /* if timer checks out */
+		if (this.timer) clearTimeout(this.timer);
+		this.timer = setTimeout(function () {
+			/* add loading image by adding loading class */
+			$('#narrowsearch').addClass('loading');
+			$('.searching').remove(); 
+
+			/* run the actual search */
+		   $.ajax({
+			contentType: "application/x-www-form-urlencoded",
+			url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
+			data: 'searchString='+searchString,
+			dataType:'xml',
+			type: 'post',	 
+			success: function (response, textStatus) {
+				/* on success remove loading img */
+				$('.searching').remove(); 
+				$('#narrowsearch').removeClass('loading');
+				processNokiaData(response);
+			}     
+		  });
+		}, 500); /* timer set to 500 ms */
+	});
\ No newline at end of file
diff --git a/tools/qdoc3/doc/config/scripts/superfish.js b/tools/qdoc3/doc/config/scripts/superfish.js
new file mode 100644
index 0000000..c6a9c7d
--- /dev/null
+++ b/tools/qdoc3/doc/config/scripts/superfish.js
@@ -0,0 +1,121 @@
+
+/*
+ * Superfish v1.4.8 - jQuery menu widget
+ * Copyright (c) 2008 Joel Birch
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * 	http://www.opensource.org/licenses/mit-license.php
+ * 	http://www.gnu.org/licenses/gpl.html
+ *
+ * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
+ */
+
+;(function($){
+	$.fn.superfish = function(op){
+
+		var sf = $.fn.superfish,
+			c = sf.c,
+			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
+			over = function(){
+				var $$ = $(this), menu = getMenu($$);
+				clearTimeout(menu.sfTimer);
+				$$.showSuperfishUl().siblings().hideSuperfishUl();
+			},
+			out = function(){
+				var $$ = $(this), menu = getMenu($$), o = sf.op;
+				clearTimeout(menu.sfTimer);
+				menu.sfTimer=setTimeout(function(){
+					o.retainPath=($.inArray($$[0],o.$path)>-1);
+					$$.hideSuperfishUl();
+					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
+				},o.delay);	
+			},
+			getMenu = function($menu){
+				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
+				sf.op = sf.o[menu.serial];
+				return menu;
+			},
+			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
+			
+		return this.each(function() {
+			var s = this.serial = sf.o.length;
+			var o = $.extend({},sf.defaults,op);
+			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
+				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
+					.filter('li:has(ul)').removeClass(o.pathClass);
+			});
+			sf.o[s] = sf.op = o;
+			
+			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
+				if (o.autoArrows) addArrow( $('>a:first-child',this) );
+			})
+			.not('.'+c.bcClass)
+				.hideSuperfishUl();
+			
+			var $a = $('a',this);
+			$a.each(function(i){
+				var $li = $a.eq(i).parents('li');
+				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
+			});
+			o.onInit.call(this);
+			
+		}).each(function() {
+			var menuClasses = [c.menuClass];
+			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
+			$(this).addClass(menuClasses.join(' '));
+		});
+	};
+
+	var sf = $.fn.superfish;
+	sf.o = [];
+	sf.op = {};
+	sf.IE7fix = function(){
+		var o = sf.op;
+		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
+			this.toggleClass(sf.c.shadowClass+'-off');
+		};
+	sf.c = {
+		bcClass     : 'sf-breadcrumb',
+		menuClass   : 'sf-js-enabled',
+		anchorClass : 'sf-with-ul',
+		arrowClass  : 'sf-sub-indicator',
+		shadowClass : 'sf-shadow'
+	};
+	sf.defaults = {
+		hoverClass	: 'sfHover',
+		pathClass	: 'overideThisToUse',
+		pathLevels	: 1,
+		delay		: 800,
+		animation	: {opacity:'show'},
+		speed		: 'normal',
+		autoArrows	: true,
+		dropShadows : true,
+		disableHI	: false,		// true disables hoverIntent detection
+		onInit		: function(){}, // callback functions
+		onBeforeShow: function(){},
+		onShow		: function(){},
+		onHide		: function(){}
+	};
+	$.fn.extend({
+		hideSuperfishUl : function(){
+			var o = sf.op,
+				not = (o.retainPath===true) ? o.$path : '';
+			o.retainPath = false;
+			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
+					.find('>ul').hide().css('visibility','hidden');
+			o.onHide.call($ul);
+			return this;
+		},
+		showSuperfishUl : function(){
+			var o = sf.op,
+				sh = sf.c.shadowClass+'-off',
+				$ul = this.addClass(o.hoverClass)
+					.find('>ul:hidden').css('visibility','visible');
+			sf.IE7fix.call($ul);
+			o.onBeforeShow.call($ul);
+			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
+			return this;
+		}
+	});
+
+})(jQuery);
diff --git a/tools/qdoc3/doc/config/style/narrow.css b/tools/qdoc3/doc/config/style/narrow.css
new file mode 100644
index 0000000..39b4740
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/narrow.css
@@ -0,0 +1,271 @@
+    /* start narrow mode */
+
+    body.narrow
+    {
+      background-image: none;
+    }
+
+    .narrow a {
+      color: #00732f;
+    }
+
+    .narrow .header, .narrow .header .content, .narrow .footer, .narrow .wrapper {
+      margin: 0 7px;
+      min-width: 300px;
+    }
+
+    .narrow .footer {
+      margin: 0px;
+    }
+
+    .creator .header, .creator .header .content, .creator .footer, .creator .wrapper {
+      margin: 0px;
+      min-width: 300px;
+    }
+    .narrow .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background: #fff url(../images/header_bg.png) repeat-x 0 100%;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+    }
+
+    .narrow .header .content
+    {
+    }
+
+    .narrow .header #nav-logo
+    {
+      display: none;
+    }
+
+    .narrow .header .qtref
+    {
+      width: auto;
+      height: auto;
+      color: #00732f;
+      position: static;
+      float: left;
+      margin-left: 25px;
+      font: bold 18px/1 Arial;
+    }
+
+    .narrow .header .qtref a
+    {
+      color: #00732F;
+    }
+
+    .narrow .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+        width: 260px;
+    }
+
+    .narrow .header #nav-topright
+    {
+      display: none;
+    }
+
+    .narrow .header #shortCut
+    {
+      clear: both;
+      font-weight: normal;
+      position: static;
+      float: left;
+      margin: 15px 0 0 25px;
+      overflow: hidden;
+      padding: 0;
+      height: auto;
+    }
+
+    .narrow .header #shortCut ul
+    {
+      float: none;
+      margin: 0;
+      width: auto;
+      font-size: 11px;
+    }
+
+    .narrow .header #shortCut ul li
+    {
+      background-image: none;
+    }
+
+    .narrow .header #shortCut ul .shortCut-topleft-active,
+    .narrow .header #shortCut ul .shortCut-topleft-inactive
+    {
+      background-image: none;
+      height: auto;
+      padding: 0;
+      width: auto;
+    }
+    .narrow .header #shortCut ul li a
+    {
+      color: #00732F;
+    }
+
+    .narrow .wrapper .hd
+    {
+        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+    }
+
+    .narrow .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+    }
+
+    .narrow .wrapper .ft
+    {
+        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+    }
+
+    .narrow .sidebar
+    {
+        display: none;
+    }
+
+    .narrow .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+
+    .creator .wrap
+    {
+        margin: 0px;
+        background:#FFFFFF;
+    }
+    .narrow .wrap .toolbar
+    {
+      border-bottom: none;
+    }
+
+    .narrow .wrap .content
+    {
+        padding-top: 15px;
+    }
+    .creator .wrap .content
+    {
+        padding-top: 10px;
+    }
+    .creator .wrap .content .guide
+    {
+        padding-top: 15px;
+    }
+    .narrow .wrap .feedback
+    {
+        display: none;
+    }
+
+    .narrow .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .narrow .wrap .breadcrumb ul li a {
+      color: #00732f;
+    }
+
+    .narrow .wrap .breadcrumb ul li.last a {
+      color: #363534;
+    }
+
+    #narrowsearch {
+      display: none;
+    }
+
+    .narrow #narrowsearch {
+      display: block;
+      float: right;
+      margin-right: 25px;
+      _position: relative;
+    }
+
+    .narrow #narrowsearch fieldset {
+      _position: absolute;
+      _margin-top: -1px;
+    }
+
+    .narrow #narrowsearch {
+      background: url("http://doc.qt.nokia.com/prototype/html/images/sprites-combined.png") no-repeat scroll -6px -348px transparent;
+      height: 21px;
+      padding: 2px 0 0 5px;
+      width: 167px;
+    }
+
+    .narrow #narrowsearch input {
+      border: none;
+      font: 13px/1.2 Verdana;
+      height: 19px;
+      outline: none;
+      padding: 0;
+      width: 158px;
+      *border: 1px solid #fff;
+      *height: 17px;
+      _height: 18px;
+    }
+    .narrow .indexbox .indexIcon {
+      display: none;
+    }
+
+    .narrow .indexboxcont .section {
+      width: 64%;
+      padding-left: 0;
+    }
+
+    .narrow .indexboxcont .sectionlist {
+      width: 32.5%;
+    }
+
+    #narrowmenu {
+      display: none;
+      float: right;
+      margin: 15px 40px 0 0;
+      font-size: 11px;
+      position: relative;
+    }
+
+    .narrow #narrowmenu {
+      display: block;
+    }
+
+    #narrowmenu a {
+      line-height: 1.1;
+      background: url(../images/arrow_down.png) no-repeat 100% 50%;
+      white-space: nowrap;
+      padding: 0 16px 0 5px;
+    }
+
+    #narrowmenu li {
+      margin-left: 20px;
+    }
+
+    #narrowmenu li li {
+      margin: 0 0 5px 0;
+    }
+
+    #narrowmenu li li a {
+      padding: 0;
+      background-image: none;
+    }
+
+    #narrowmenu li,
+    #narrowmenu li ul {
+      background-color: #fff;
+      margin-top:-1px;
+    }
+
+    #narrowmenu li ul {
+      width: auto;
+      padding: 5px;
+    }
+
+    .sf-menu li:hover ul, .sf-menu li.sfHover ul {
+      top: 1.2em;
+    }
+
+    /* end narrow mode */
+    .creator #narrowsearch, .creator #narrowmenu{
+        display:none;
+    }
diff --git a/tools/qdoc3/doc/config/style/offline.css b/tools/qdoc3/doc/config/style/offline.css
new file mode 100644
index 0000000..3689ee8
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/offline.css
@@ -0,0 +1,673 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin-left: 0.5em;
+        margin-right: 0.5em;
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        margin: 0 1.5em 1em 1em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1.5em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 2em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+        font-style: italic
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-bottom: 0.5em
+    }
+
+    .naviNextPrevious
+    {
+        display: none
+    }
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 150%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 135%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
diff --git a/tools/qdoc3/doc/config/style/style.css b/tools/qdoc3/doc/config/style/style.css
new file mode 100644
index 0000000..48ecedc
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/style.css
@@ -0,0 +1,1733 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
+    {
+        margin: 0;
+        padding: 0;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:5px;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    input, button, textarea, select, optgroup, option
+    {
+        font-family: inherit;
+        font-size: inherit;
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    input, button, textarea, select
+    {
+        font-size: 100%;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    /* adding Qt theme */
+    html
+    {
+      /*  background-color: #e5e5e5;*/
+    }
+    body
+    {
+        background: #e6e7e8 url(../images/page_bg.png) repeat-x 0 0;
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 15px 0px 15px 0px;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px;
+        margin-bottom: 25px;
+    }
+    pre.highlightedCode {
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 5px;
+        font:600 12px/1.2 Arial;
+    }
+    th
+    {
+        padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 3px 15px 3px 20px;
+    }
+    tr.odd td:hover,  tr.even td:hover    {}
+
+    td.rightAlign
+    {
+        padding: 3px 5px 3px 10px;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
+    }
+    table tr.odd td:hover, table tr.even td:hover
+    {
+     /*   background-color: #E6E6E6;*/ /* disabled until further notice */
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+        font-style: italic
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font: normal bold 16px/1.2 Arial;
+        padding-bottom: 15px;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+    .red
+    {
+        color:red;
+    }
+    .figCaption{
+        color:#363534;
+        font:italic 11px/1.2 Verdana;
+        padding-top:0;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer, .wrapper
+    {
+        min-width: 600px;
+        max-width: 1500px;
+        margin: 0 30px;
+    }
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header
+    {
+        height: 115px;
+        position: relative;
+    }
+    .header .icon
+    {
+        position: absolute;
+        top: 13px;
+        left: 0;
+    }
+    .header .qtref
+    {
+        position: absolute;
+        top: 28px;
+        left: 88px;
+        width: 302px;
+        height: 22px;
+    }
+    .header .qtref span
+    {
+        display: block;
+        width: 302px;
+        height: 22px;
+        text-indent: -999em;
+        background: url(../images/sprites-combined.png) no-repeat -78px -235px;
+    }
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        padding-right: 3px;
+        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
+        height: 20px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+    {
+        text-decoration:none;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+    }
+/* end header elements */
+
+/* content and sidebar elements */
+    .wrapper
+    {
+        background: url(../images/bg_r.png) repeat-y 100% 0;
+    }
+
+    .wrapper .hd
+    {
+        padding-left: 16px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0px -15px;
+        overflow: hidden;
+    }
+
+    .wrapper .hd span
+    {
+        height: 15px;
+        display: block;
+        overflow: hidden;
+        background: url(../images/page.png) no-repeat 100% -30px;
+    }
+
+    .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+        position: relative;
+    }
+
+    .wrapper .ft
+    {
+        padding-left: 16px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0 -75px;
+        overflow: hidden;
+    }
+
+    .wrapper .ft span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/page.png) no-repeat 100% -60px;
+        overflow: hidden;
+    }
+    .navTop{
+        float:right;
+        display:block;
+        padding-right:15px;
+    }
+/* end content and sidebar elements */
+
+/* sidebar elements */
+    .sidebar
+    {
+        float: left;
+        margin-left: 5px;
+        width: 200px;
+        font-size: 11px;
+    }
+
+    .sidebar .searchlabel
+    {
+        padding: 0 0 2px 17px;
+        font: normal bold 11px/1.2 Verdana;
+    }
+
+    .sidebar .search
+    {
+        padding: 0 15px 0 16px;
+    }
+
+    .sidebar .search form
+    {
+        background: url(../images/sprites-combined.png) no-repeat -6px -348px;
+        height:21px;
+        padding:2px 0 0 5px;
+        width:167px;
+    }
+
+    .sidebar .search form input#pageType
+    {
+        width: 158px;
+        height: 19px;
+        padding: 0;
+        border: 0px;
+        outline: none;
+        font: 13px/1.2 Verdana;
+    }
+
+    .sidebar .box
+    {
+        padding: 17px 15px 5px 16px;
+    }
+
+    .sidebar .box .first
+    {
+        background-image: none;
+    }
+
+    .sidebar .box h2
+    {
+        font: bold 16px/1.2 Arial;
+        padding: 0;
+    }
+    .sidebar .box h2 span
+    {
+        overflow: hidden;
+        display: inline-block;
+    }
+    .sidebar .box#lookup h2
+    {
+        background-image: none;
+    }
+    .sidebar #lookup.box h2 span
+    {
+    }
+    .sidebar .box#topics h2
+    {
+        background-image: none;
+    }
+    .sidebar #topics.box h2 span
+    {
+    }
+    .sidebar .box#examples h2
+    {
+        background-image: none;
+    }
+    .sidebar #examples.box h2 span
+    {
+    }
+
+    .sidebar .box .list
+    {
+        display: block;
+        max-height:200px;
+        min-height:120px;
+        overflow-y:auto;
+        overflow-x:none;
+    }
+    .list li a:hover
+    {
+        text-decoration: underline;
+    }
+    .sidebar .box ul
+    {
+        padding-bottom:5px;
+        padding-left:10px;
+        padding-top:5px;
+    }
+    .sidebar .box ul li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_gt.png) no-repeat 0 5px;
+        margin-bottom: 5px;
+    }
+    .sidebar .bottombar
+    {
+        background: url(../images/box_bg.png) repeat-x 0 bottom;
+    }
+    .sidebar .box ul li.noMatch
+    {
+        background: none;
+        color:#FF2A00;
+        font-style:italic;
+    }
+    .sidebar .box ul li.hit
+    {
+        background: none;
+        color:#AAD2F0;
+        font-style:italic;
+    }
+    .sidebar .search form input.loading
+    {
+        background:url("../images/spinner.gif") no-repeat scroll right center transparent;
+    }
+
+    .sidebar .search form {
+        _height: 23px;
+        _width: 169px;
+    }
+
+    #resultdialog {
+      display: none;
+      position: absolute;
+      *left: 30px;
+      _left: 0;
+      *top: 35px;
+      _top: 30px;
+      _zoom: 1;
+      background-color: #fff;
+      border: 1px solid #666;
+      z-index: 4;
+      margin-top: 5px;
+      _margin: 0 0 0 -20px;
+      padding: 10px;
+      width: 30%;
+      _width: 196px;
+      height: 250px;
+      overflow: auto;
+      -webkit-border-radius: .5em;
+      -moz-border-radius: .5em;
+      border-radius: .5em;
+      -webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      -moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      font-size: 11px;
+    }
+
+    #resultdialog a
+    {
+      color: #00732f;
+    }
+
+    #resultdialog.active {
+      display: block;
+    }
+
+    .narrow #resultdialog {
+      width: 60%;
+      _width: 360px;
+    }
+
+    .narrow #resultdialog.active {
+      right: 10px;
+      *left: auto;
+      _left: auto;
+      _right: -20px;
+    }
+
+
+    #resultdialog #resultclose {
+      float: right;
+    }
+
+    #resultdialog p,
+    #resultdialog ul {
+      clear: both;
+      margin: 3px 0;
+    }
+
+    p#searchcount span {
+      display: none;
+    }
+
+    p#searchcount.all span#resultcount,
+    p#searchcount.api span#apicount,
+    p#searchcount.article span#articlecount,
+    p#searchcount.example span#examplecount {
+      display: inline;
+    }
+
+    #resultlist li {
+      display: none;
+    }
+
+    #resultlist.api li.api,
+    #resultlist.article li.article,
+    #resultlist.example li.example,
+    #resultlist.all li {
+        display: block;
+    }
+
+    #resultlinks.api a#showapiresults,
+    #resultlinks.api a#showapiresults:hover,
+    #resultlinks.article a#showarticleresults,
+    #resultlinks.article a#showarticleresults:hover,
+    #resultlinks.example a#showexampleresults,
+    #resultlinks.example a#showexampleresults:hover,
+    #resultlinks.all a#showallresults,
+    #resultlinks.all a#showallresults:hover {
+        color: #B0ADAB;
+    }
+    .floatingResult{
+        z-index:1;
+        position:relative;
+        padding-top:0px;
+        background-color:white;
+        border:solid 1px black;
+        height:250px;
+        width:600px;
+        overflow-x:hidden;
+        overflow-y:auto;
+    }
+
+    .floatingResult:hover{
+        display:block;
+    }
+    .floatingResult:hover{
+    }
+/* end sidebar elements */
+
+/* content elements */
+    .wrap
+    {
+        margin: 0 5px 0 5px;
+        overflow: visible;
+    }
+
+    .wrap .toolbar
+    {
+        background-color: #fafafa;
+        border-bottom: 1px solid #d1d1d1;
+        height: 20px;
+        position: relative;
+    }
+    .wrap .toolbar .toolblock
+    {
+        position: absolute;
+    }
+    .wrap .toolbar .breadcrumb
+    {
+        font-size: 11px;
+        line-height: 1.2;
+        padding: 0 0 10px 21px;
+        height: 10px;
+    }
+    .wrap .toolbar .toolbuttons
+    {
+        padding: 0 0 10px 21px;
+        right: 5px;
+        vertical-align: middle;
+        overflow: hidden;
+    }
+    .wrap .toolbar .toolbuttons .active
+    {
+        color: #00732F;
+    }
+    .wrap .toolbar .toolbuttons ul
+    {
+        float: right;
+    }
+    .wrap .toolbar .toolbuttons li
+    {
+        float: left;
+        text-indent: -10px;
+        margin-top: -5px;
+        margin-right: 15px;
+        font-weight: bold;
+        color: #B0ADAB;
+        font: bold 10px/1.2 Verdana;
+    }
+
+    .toolbuttons #print
+    {
+        border-left: 1px solid #c5c4c4;
+        margin-top: 0;
+        padding-left: 7px;
+        text-indent: 0;
+    }
+    .toolbuttons #print a
+    {
+        width: 16px;
+        height: 16px;
+    }
+
+    .toolbuttons #print a span
+    {
+        width: 16px;
+        height: 16px;
+        text-indent: -999em;
+        display: block;
+        overflow: hidden;
+        background: url(../images/sprites-combined.png) no-repeat -137px -311px;
+    }
+
+    .toolbuttons #smallA
+    {
+        font-size: 10pt;
+    }
+    .toolbuttons #medA
+    {
+        font-size: 12pt;
+    }
+    .toolbuttons #bigA
+    {
+        font-size: 14pt;
+        margin-right: 7px;
+    }
+
+    #smallA:hover, #medA:hover, #bigA:hover
+    {
+        color: #00732F;
+    }
+
+    .wrap .content
+    {
+        padding: 30px;
+        word-wrap:break-word;
+    }
+
+    .wrap .breadcrumb ul
+    {
+    }
+    .wrap .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 15px;
+        margin-left: 15px;
+        font-weight: bold;
+    }
+    .wrap .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+    .wrap .breadcrumb ul li a
+    {
+        color: #363534;
+    }
+    .wrap .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .wrap .content ol li {
+        background:none;
+        font:normal 10pt/1.2 Verdana;
+
+        margin-bottom:10px;
+        margin-left:12px;
+        /*list-style-type:disc;*/
+    }
+
+    .wrap .content ol li
+    {
+        background:none;
+        margin-bottom: 10px;
+        padding-left:0px;
+        margin-left:52px;
+    }
+
+    .wrap .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 400 10pt/1.2 Verdana;
+        margin-bottom: 10px;
+        padding-left:12px;
+    }
+
+    .content li:hover  {}
+
+    .wrap .content h1
+    {
+        font: bold 18px/1.2 Arial;
+    }
+    .wrap .content h2
+    {
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;
+    }
+    .wrap .content h3
+    {
+        font: bold 14px/1.2 Arial;
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;
+    }
+    .wrap .content p
+    {
+        line-height: 20px;
+        padding: 5px;
+    }
+    .wrap .content table p
+    {
+        line-height: 20px;
+    }
+    .wrap .content ul
+    {
+        padding-left: 25px;
+        padding-top: 10px;
+    }
+    .wrap .content ul img {
+        vertical-align:middle;
+    }
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+    .feedback
+    {
+        float: none;
+        position: absolute;
+        right: 15px;
+        bottom: 10px;
+        font: normal 8px/1 Verdana;
+        color: #B0ADAB;
+    }
+    .feedback:hover
+    {
+        float: right;
+        font: normal 8px/1 Verdana;
+        color: #00732F;
+        text-decoration: underline;
+    }
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .wrap .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 160%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    *.qmlitem p
+    {
+    }
+    #feedbackBox
+    {
+        display: none;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        position: fixed;
+        top: 100px;
+        left: 33%;
+        height: 230px;
+        width: 400px;
+        padding: 5px;
+        background-color: #e6e7e8;
+        z-index: 4;
+    }
+    #feedcloseX
+    {
+        display: inline;
+        padding: 5px 5px 0 0;
+        margin-bottom: 3px;
+        color: #363534;
+        font-weight:bold;
+        float: right;
+        text-decoration: none;
+    }
+
+    #feedbox
+    {
+        display: inline;
+        width: 370px;
+        height: 120px;
+        margin: 0px 25px 10px 15px;
+    }
+    #noteHead
+    {
+        font-weight:bold;
+        padding:10px 10px 10px 20px;
+    }
+    #feedsubmit
+    {
+        display: inline;
+        float: right;
+        margin: 4px 32px 0 0;
+    }
+
+    .note
+    {
+        font-size:7pt;
+        padding-bottom:3px;
+        padding-left:20px;
+    }
+
+    #blurpage
+    {
+        display: none;
+        position: fixed;
+        float: none;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        background: transparent url(../images/feedbackground.png) 0 0;
+        z-index: 3;
+    }
+    .toc
+    {
+        float: right;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #DDDDDD;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        height: auto;
+        width: 200px;
+    }
+
+    .toc h3, .generic a
+    {
+        font: bold 12px/1.2 Arial;
+    }
+
+    .generic{
+    }
+    .generic td{
+    /* padding:5px;*/
+    }
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .alignedsummary{}
+    .propsummary{}
+    .memItemLeft{}
+    .memItemRight{
+        padding:3px 15px 3px 0;
+    }
+    .bottomAlign{}
+    .highlightedCode
+    {
+        margin:10px;
+    }
+    .LegaleseLeft{}
+    .valuelist{}
+    .annotated td{
+        padding: 3px 5px 3px 5px;
+    }
+    .obsolete{}
+    .compat{}
+    .flags{}
+    .qmlsummary{}
+    .qmlitem{}
+    .qmlproto{}
+    .qmlname{}
+    .qmlreadonly{}
+    .qmldefault{}
+    .qmldoc{}
+    .qt-style{}
+    .redFont{}
+    code{}
+
+    .wrap .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .wrap .content .toc h3{
+        border-bottom:0px;
+        margin-top:0px;
+    }
+
+    .wrap .content .toc h3  a:hover{
+        color:#00732F;
+        text-decoration:none;
+    }
+
+
+    .wrap .content .toc .level2
+    {
+        margin-left: 15px;
+    }
+
+    .wrap .content .toc .level3
+    {
+        margin-left: 30px;
+    }
+
+    .content .toc li
+    {
+        font: normal 10px/1.2 Verdana;
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+    }
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 15px;
+    }
+    .content .relpage li
+    {
+        font: normal 11px/1.2 Verdana;
+    }
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+/* end content elements */
+
+/* footer elements */
+    .footer
+    {
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .small
+    {
+        font: normal 9px/1 Verdana;
+    }
+/* end footer elements */
+
+    /* start index box */
+    .indexbox
+    {
+        width: 100%;
+        display:inline-block;
+    }
+
+    .indexboxcont
+    {
+        display: block;
+
+    }
+
+    .indexboxbar
+    {
+        background: transparent url(../images/horBar.png ) repeat-x left bottom;
+        margin-bottom: 25px;
+
+
+    }
+
+    .indexboxcont .section
+    {
+        display: inline-block;
+        width: 49%;
+        *width:42%;
+        _width:42%;
+        padding:0 2% 0 1%;
+        vertical-align:top;
+    }
+
+    .indexboxcont .indexIcon
+    {
+        width: 11%;
+        *width:18%;
+        _width:18%;
+        overflow:hidden;
+    }
+
+    .indexboxcont .section {
+      float: left;
+    }
+
+    .indexboxcont .section p
+    {
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+    .indexboxcont .sectionlist
+    {
+        display: inline-block;
+        vertical-align:top;
+        width: 32.5%;
+        padding: 0;
+    }
+    .indexboxcont .sectionlist ul
+    {
+        margin-bottom: 20px;
+    }
+
+    .indexboxcont .sectionlist ul li
+    {
+        line-height: 12px;
+    }
+
+    .content .indexboxcont li
+    {
+        font: normal bold 13px/1 Verdana;
+    }
+
+    .indexbox a:hover, .indexbox a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    .indexbox a:visited
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+
+    .indexbox .indexIcon {
+        width: 11%;
+    }
+
+    .indexbox .indexIcon span
+    {
+        display: block;
+    }
+
+    .indexbox.guide .indexIcon span
+    {
+        width: 96px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -5px -376px;
+        padding: 0;
+    }
+
+    .indexbox.tools .indexIcon span
+    {
+        width: 115px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
+        padding: 0;
+    }
+    .indexboxcont:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+
+
+
+/* start of creator spec*/
+    .creator
+    {
+        margin-left:0px;
+        margin-right:0px;
+        padding-left:0px;
+        padding-right:0px;
+    }
+    .creator .wrap .content ol li {
+        list-style-type:decimal;
+    }
+    .creator .header .icon,
+    .creator .feedback,
+    .creator .t_button,
+    .creator .feedback,
+    .creator #feedbackBox,
+    .creator #feedback,
+    .creator #blurpage,
+    /* .creator .indexbox .indexIcon span,*/
+    .creator .wrapper .hd,
+    /* .creator  .indexbox .indexIcon,*/
+    .creator .header #nav-logo,
+    .creator #offlinemenu,
+    .creator #offlinesearch,
+    .creator  .header #nav-topright,
+    .creator .header #shortCut ,
+    .creator .wrapper .hd,
+    .creator .wrapper .ft,
+    .creator .sidebar,
+    .creator .wrap .feedback
+    {
+        display:none;
+    }
+
+    body.creator
+    {
+        background: none;
+
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+        background-color: #FAFAFA;
+    }
+
+    .wrap .content ol li {
+
+    }
+
+
+    .creator .header, .creator .footer, .creator .wrapper
+    {
+        max-width: 1500px;
+        margin: 0px;
+    }
+
+    .creator .wrapper
+    {
+        position:relative;
+        top:5px;
+    }
+    .creator .wrapper .bd
+    {
+        background:#FFFFFF;
+    }
+
+
+    .creator .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .creator .wrap .content p
+
+    {
+        line-height: 20px;
+        padding: 5px;
+    }
+
+    .creator .header .qtref span
+    {
+        background:none;
+    }
+
+    .creator .footer
+    {
+        border-top:1px solid #E5E5E5;
+        height: 50px;
+        margin:0px;
+        padding:10px;
+    }
+
+    .creator .footer p
+    {
+        text-align:justify;
+        max-width:900px;
+    }
+
+    .creator .wrap
+    {
+        padding:0 5px 0 5px;
+        margin: 0px;
+    }
+    .creator .wrap .toolbar
+    {
+        border-bottom:1px solid #E5E5E5;
+        /*width:100%;*/
+        margin-left:-5px;
+        margin-right:-5px;
+    }
+    .creator .wrap .breadcrumb ul li a
+    {
+      /*  color: #363534;*/
+        color: #00732F;
+    }
+
+    .creator .wrap .content
+    {
+        padding: 0px;
+        word-wrap:break-word;
+    }
+
+    .creator .wrap .content ol li {
+        background:none;
+        font: inherit;
+        padding-left: 0px;
+    }
+
+    .creator .wrap .content .descr ol li {
+        margin-left: 45px;
+    }
+
+    .creator .content .alignedsummary
+    {
+        margin: 5px;
+        width:100%;
+    }
+    .creator .generic{
+        max-width:75%;
+    }
+    .creator .generic td{
+        /*padding:0;*/
+    }
+    .creator .indexboxbar
+    {
+        border-bottom:1px solid #E5E5E5;
+        margin-bottom: 25px;
+        background: none;
+    }
+
+    .creator .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background-color: #ffffff;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+      border-bottom: solid #E5E5E5 1px;
+      z-index:1;
+      /*  position:fixed;*/
+    }
+
+    .creator .header .content
+    {
+    }
+    .creator .header .qtref
+    {
+      color: #00732F;
+      position: static;
+      float: left;
+      margin-left: 5px;
+      font: bold 18px/1 Arial;
+    }
+
+    .creator .header .qtref:visited
+    {
+      color: #00732F;
+    }
+    .creator .header .qtref:hover
+    {
+      color: #00732F;
+      text-decoration:none;
+    }
+    .creator .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+      text-decoration:none;
+    }
+
+    .creator .wrap .toolbar
+    {
+      display:block;
+      padding-top:0px;
+    }
+
+    .creator .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .creator .wrap .breadcrumb ul li a {
+      /*color: #44a51c;*/
+    }
+
+    .creator .wrap .breadcrumb ul li.last a {
+      /*color: #363534;*/
+    }
+
+    .creator #narrowmenu ul
+    {
+      border-bottom:solid 1px #E5E5E5;
+      border-left:solid 1px #E5E5E5;
+      border-right:solid 1px #E5E5E5;
+    }
+
+    .creator #narrowmenu li ul {
+      margin-top:-15px;
+    }
+
+    .creator .toc {
+      margin:10px 20px 10px 10px;
+    }
+
+    .creator #narrowsearch, .creator #narrowmenu{
+        display:none;
+    }
+/* end of creator spec*/
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
diff --git a/tools/qdoc3/doc/config/style/style_ie6.css b/tools/qdoc3/doc/config/style/style_ie6.css
new file mode 100644
index 0000000..16fb850
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/style_ie6.css
@@ -0,0 +1,54 @@
+.indexbox, .indexboxcont, .group {
+  zoom: 1;
+  height: 1%;
+}
+
+.sidebar {
+  margin-left: 3px;
+  width: 199px;
+  overflow: hidden;
+}
+
+.sidebar .search form {
+  position: relative;
+}
+
+.sidebar .search form fieldset {
+  position: absolute;
+  margin-top: -1px;
+}
+
+.sidebar .search form input#searchstring  {
+  border: 1px solid #fff;
+  height: 18px;
+}
+
+.wrap {
+  zoom: 1;
+}
+
+.content,
+.toolbar {
+  zoom: 1;
+  margin-left: -3px;
+  position: relative;
+}
+
+.indexbox {
+  clear: both;
+}
+
+.indexboxcont .section {
+  zoom: 1;
+  float: left;
+}
+
+.indexboxcont .sectionlist {
+  zoom: 1;
+  float: left;
+}
+
+.wrap .toolbar .toolbuttons li {
+  text-indent: 0;
+  margin-right: 8px;
+}
\ No newline at end of file
diff --git a/tools/qdoc3/doc/config/style/style_ie7.css b/tools/qdoc3/doc/config/style/style_ie7.css
new file mode 100644
index 0000000..afbff5f
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/style_ie7.css
@@ -0,0 +1,19 @@
+.indexbox, .indexboxcont, .group {
+  min-height: 1px;
+}
+
+.sidebar .search form input#searchstring  {
+  border: 1px solid #fff;
+  height: 17px;
+}
+
+
+.indexboxcont .section {
+  zoom: 1;
+  float: left;
+}
+
+.indexboxcont .sectionlist {
+  zoom: 1;
+  float: left;
+}
diff --git a/tools/qdoc3/doc/config/style/style_ie8.css b/tools/qdoc3/doc/config/style/style_ie8.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/style_ie8.css
diff --git a/tools/qdoc3/doc/config/style/superfish.css b/tools/qdoc3/doc/config/style/superfish.css
new file mode 100644
index 0000000..2bdaef4
--- /dev/null
+++ b/tools/qdoc3/doc/config/style/superfish.css
@@ -0,0 +1,51 @@
+.sf-menu, .sf-menu * {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.sf-menu {
+  line-height: 1.0;
+}
+.sf-menu ul {
+  position: absolute;
+  top: -999em;
+  width: 10em; /* left offset of submenus need to match (see below) */
+}
+.sf-menu ul li {
+  width: 100%;
+}
+.sf-menu li:hover {
+  visibility: inherit; /* fixes IE7 'sticky bug' */
+}
+.sf-menu li {
+  float: left;
+  position: relative;
+}
+.sf-menu a {
+  display: block;
+  position: relative;
+}
+.sf-menu li:hover ul,
+.sf-menu li.sfHover ul {
+  left: 0;
+  top: 2.5em; /* match top ul list item height */
+  z-index: 99;
+}
+ul.sf-menu li:hover li ul,
+ul.sf-menu li.sfHover li ul {
+  top: -999em;
+}
+ul.sf-menu li li:hover ul,
+ul.sf-menu li li.sfHover ul {
+  left: 10em; /* match ul width */
+  top: 0;
+}
+ul.sf-menu li li:hover li ul,
+ul.sf-menu li li.sfHover li ul {
+  top: -999em;
+}
+ul.sf-menu li li li:hover ul,
+ul.sf-menu li li li.sfHover ul {
+  left: 10em; /* match ul width */
+  top: 0;
+}
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 7290c0e..0e4055b 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -27,727 +27,924 @@
 
 /*!
     \page index.html
-    \nextpage QDoc Manual
+    \nextpage Introduction to QDoc
 
-    \title QDoc Manual - Table of Contents
+    \title Table of Contents
 
     \list
-    \o \l{QDoc Manual}
-    \o \l{QDoc Commands}
-       \list
-       \o \l{Markup Commands}
-       \o \l{Text Formatting Commands}
-       \o \l{Document Structuring Commands}
-       \o \l{Verbatim Code Commands}
-       \o \l{Quoting External Code Commands}
-          \list
-          \o \l{Example File}
-          \endlist
-       \o \l{Linking Commands}
-       \o \l{Graphic Commands}
-       \o \l{Container Commands}
-       \o \l{Document Contents Commands}
-       \o \l{Miscellaneous Commands}
-          \list
-          \o \l{signalandslots.qdocinc}
-          \o \l{objectmodel.qdocinc}
-          \o \l{layoutmanagement.qdocinc}
-          \endlist
-       \o \l{Topical Commands}
-       \o \l{Contextual Commands}
-       \o \l{Navigation Commands}
-       \o \l{Status Commands}
-       \o \l{Thread Support Commands}
-       \o \l{Relating Commands}
-       \o \l{Grouping Commands}
-       \o \l{Title Commands}
-       \endlist
-    \o \l{QDoc Configuration}
-       \list
-       \o \l{General Configuration Variables}
-       \o \l{Creating Help Project Files}
-       \o \l{C++ Specific Configuration Variables}
-       \o \l{HTML Specific Configuration Variables}
-       \o \l{Supporting Derived Projects}
-       \o \l{QDoc Compatibility}
-       \o \l{qt.qdocconf}
-       \o \l{minimum.qdocconf}
-       \endlist
-    \o \l{QDoc Commands - Alphabetical List}
+      \o \l {Introduction to QDoc}
+      \o \l {Command Index}
+      \o \l {Topic Commands}
+      \o \l {Context Commands}
+        \list
+          \o \l {Document Navigation}
+          \o \l {Reporting Status}
+          \o \l {Thread Support}
+          \o \l {Relating Things}
+          \o \l {Grouping Things}
+          \o \l {Naming Things}
+        \endlist
+      \o \l{Markup Commands}
+        \list
+          \o \l {Text Markup}
+          \o \l {Document Structure}
+          \o \l {Including Code Inline}
+          \o \l {Including External Code}
+          \o \l {Creating Links}
+          \o \l {Including Images}
+          \o \l {Tables and Lists}
+          \o \l {Special Content}
+          \o \l {Miscellaneous}
+        \endlist
+      \o \l {The QDoc Configuration File}
+        \list
+          \o \l {Generic Configuration Variables}
+          \o \l {Creating Help Project Files}
+          \o \l {C++ Specific Configuration Variables}
+          \o \l {HTML Specific Configuration Variables}
+          \o \l {Supporting Derived Projects}
+          \o \l {Compatibility Issues}
+          \o \l {qt.qdocconf}
+          \o \l {minimum.qdocconf}
+        \endlist
     \endlist
+
 */
 
 /*!
     \page 01-qdoc-manual.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage QDoc Manual - Table of Contents
-    \nextpage QDoc Commands
-
-    \title QDoc Manual
-
-    QDoc is the internal tool used by Qt Development Frameworks for generating
-    documentation. This document is a reference for QDoc command syntax and
-    configuration.
+    \contentspage Table of Contents
+    \previouspage Table of Contents
+    \nextpage Command Index
+
+    \title Introduction to QDoc
+
+    QDoc is a tool used by Qt Developers to generate documentation for
+    software projects. It works by extracting \e {qdoc comments} from
+    project source files and then formatting these comments as HTML
+    pages or DITA XML documents, etc. QDoc finds qdoc comments in \c
+    {.cpp} files and in \c {.qdoc} files. QDoc does not look for qdoc
+    comments in \c {.h} files. A qdoc comment always begins with an
+    exclamation mark \bold{!} e.g.:
+
+    \code 
+        / *! 
+            \class QObject
+            \brief The QObject class is the base class of all Qt objects.
+
+            \ingroup objectmodel
+
+            \reentrant
+
+            QObject is the heart of the Qt \l{Object Model}. The
+            central feature in this model is a very powerful mechanism
+            for seamless object communication called \l{signals and
+            slots}. You can connect a signal to a slot with connect()
+            and destroy the connection with disconnect(). To avoid
+            never ending notification loops you can temporarily block
+            signals with blockSignals(). The protected functions
+            connectNotify() and disconnectNotify() make it possible to
+            track connections.
+
+            QObjects organize themselves in \l {Object Trees &
+            Ownership} {object trees}. When you create a QObject with
+            another object as parent, the object will automatically
+            add itself to the parent's children() list. The parent
+            takes ownership of the object; i.e., it will automatically
+            delete its children in its destructor. You can look for an
+            object by name and optionally type using findChild() or
+            findChildren().
+
+            Every object has an objectName() and its class name can be
+            found via the corresponding metaObject() (see
+            QMetaObject::className()).  You can determine whether the
+            object's class inherits another class in the QObject
+            inheritance hierarchy by using the inherits() function.
+
+	    ....
+	* /
+    \endcode
 
-    \section1 Overview
+    From the qdoc comment above, QDoc generates the now famous HTML
+    page \l {http://doc.trolltech.com/4.7/qobject.html#details}
+    {QObject Class Reference}.
+    
+    This manual explains how to use the QDoc commands in qdoc comments
+    to embed good documentation in your source files. It also explains
+    how to make a \l {The QDoc Configuration File} {QDoc configuration
+    file}, which you will pass to QDoc on the command line.
 
-    \list I
-    \o \section2 \l {QDoc Commands}
+    \section1 Running QDoc
 
-       \l {QDoc Commands - Alphabetical List}{A complete alphabetical
-       list}.
+    The current name of the QDoc program is \c {qdoc3}. To run qdoc3
+    from the command line, give it the name of a configuration file:
 
-       There are two main categories of commands for QDoc: markup
-       commands and meta-commands.
+    \quotation
+        \c {$ ../../bin/qdoc3 ./config.qdocconf}
+    \endquotation
 
-       The markup commands indicate the generated documentation's
-       appearance and logical structure. The meta-commands provide
-       information about the document as well as the documented
-       item. The meta-commands can be further categorized as topical
-       commands and contextual commands.
+    QDoc recognizes the \c {.qdocconf} suffix as a \l{The QDoc
+    Configuration File} {QDoc configuration file}. The configuration
+    file is where you tell QDoc where to find the project source
+    files, header files, and \c {.qdoc} files. It is also where you
+    tell QDoc what kind of output to generate (HTML, DITA XML,...),
+    and where to put the generated documentation. The configuration
+    file also contains other information for QDoc.
+
+    See \l{The QDoc Configuration File} for a instructions on how to
+    build a Qdoc configuration file.
+
+    \section1 How QDoc Works
+
+    QDoc begins by reading the configuarion file you specified on the
+    command line. It stores all the variables from the configuration
+    file for later use. One of the first variables it uses is \c
+    {outputformats}. This variable tells QDoc which output generators
+    it will run. The default value is \e {HTML}, so if you don't set
+    \c {outputformats} in your configuration file, QDoc will generate
+    HTML output. That's usually what you will want anyway, but you can
+    also specify \e {DITAXML} to get DITA XML output instead.
+
+    Next, QDoc uses the values of the \l
+    {22-qdoc-configuration-generalvariables.html#headerdirs-variable}
+    {headerdirs} variable and/or the \l
+    {22-qdoc-configuration-generalvariables.html#headers-variable}
+    {headers} variable to find and parse all the header files for your
+    project. QDoc does \e not scan header files for qdoc comments. It
+    parses the header files to build a master tree of all the items
+    that should be documented (i.e. the items that QDoc should find 
+    qdoc comments for).
+
+    After parsing all the header files and building the master tree of
+    items to be documented, QDoc uses the value of the \l
+    {22-qdoc-configuration-generalvariables.html#sourcedirs-variable}
+    {sourcedirs} variable and/or the value of the \l
+    {22-qdoc-configuration-generalvariables.html#sources-variable}
+    {sources} variable to find and parse all the \c {.cpp} and \c
+    {.qdoc} files for your project. These are the files QDoc scans for
+    \e {qdoc comments}. Remember that a qdoc comment begins with 
+    an exclamation mark, i.e. \bold {/*!} .
+
+    For each qdoc comment it finds, it searches the master tree for
+    the item where the documentation belongs. The it interprets the
+    qdoc commands in the comment and stores the interpreted commands
+    and the comment text in the tree node for the item. 
+
+    Finally, QDoc traverses the master tree. For each node, if the
+    node has stored documentation, QDoc calls the output generator
+    specified by the \c {outputformats} variable to format and write
+    the documentation in the directory specified in the configuration
+    file in the \l
+    {22-qdoc-configuration-generalvariables.html#outputdir-variable}
+    {outputdir} variable.
+
+    \section1 Command Types
+
+    QDoc interprets three types of commands: 
 
-       \list
-       \o \l {Markup Commands}
-           \list
-           \o \l {Text Formatting Commands}{Text Formatting}
-           \o \l {Document Structuring Commands}{Document Structuring}
-           \o \l {Verbatim Code Commands}{Verbatim Code}
-           \o \l {Quoting External Code Commands}{Quoting External Code}
-           \o \l {Linking Commands}{Linking}
-           \o \l {Graphic Commands}{Graphic}
-           \o \l {Container Commands}{Container}
-           \o \l {Document Contents Commands}{Document Contents}
-           \o \l {Miscellaneous Commands}{Miscellaneous}
-           \endlist
-       \o \l {Topical Commands}
-       \o \l {Contextual Commands}
-           \list
-           \o \l {Navigation Commands}{Navigation}
-           \o \l {Status Commands}{Status}
-           \o \l {Thread Support Commands}{Thread Support}
-           \o \l {Relating Commands}{Relating}
-           \o \l {Grouping Commands}{Grouping}
-           \o \l {Title Commands}{Title}
-           \endlist
-       \endlist
+    \list
+    \o \l {Topic Commands} 
+    \o \l {Context Commands}
+    \o \l {Markup Commands}
     \endlist
 
-    \list II
-    \o \section2 \l {QDoc Configuration}
-
-       When running QDoc to generate the documentation, you must
-       specify a configuration file on the command line. The
-       configuration file is a list of entries of entries of the form
-       "variable = value".
-
-       \list
-       \o \l {Configuration Variables}
-       \o \l {Configuration File Examples}
-       \endlist
-
-       Some particular configuration variables allow you to use QDoc
-       to support Qt-based projects; i.e to make projects, such as Qt
-       Solutions, contain references to the online Qt documentation.
-
-       \list
-       \o \l {Supporting Derived Projects}
-       \endlist
-
-       QDoc is a tool that constantly evolves to suit our needs, for
-       that reason there are some compatibility issues between old and
-       new practices.
-
-       \list
-       \o \l {QDoc Compatibility}
-       \endlist
-    \endlist
+    Topic commands identify the elememt you are documenting, e.g. a C++
+    class, function, or type, an example, or an extra page of text
+    that doesn't map to an underlying C++ elememnt.
+
+    Context commands tell QDoc how the element being documented
+    relates to other documented elememnts, e.g. next and previous page
+    links or inclusion in page groups or library modules. Context
+    commands can also provide information about the documented element
+    that QDoc can't get from the source files, e.g. whether the
+    element is thread-safe, an overloaded or reimplemented function,
+    or that it has been deprecated.
+
+    Markup commands tell QDoc how text and image elements in the
+    document should be rendered, or about the document's outline
+    structure.  
 */
 
 /*!
-    \page 02-qdoc-commands.html
-    \previouspage QDoc Manual
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Markup Commands
-
-    \title QDoc Commands
+    \page 03-qdoc-commands-markup.html
+    \contentspage Table of Contents
+    \previouspage Naming Things
+    \nextpage Text Markup
 
-    There are two main categories of commands for QDoc: markup
-    commands and meta-commands.
+    \title Markup Commands
 
     The markup commands indicate the generated documentation's visual
-    appearance and logical structure. The meta-commands provide
-    information about the documentation unit as well as the documented
-    item. The meta-commands can be further categorized as topical
-    commands and contextual commands.
-
-    \section1 Alphabetical List
-
-    A complete \l{QDoc Commands - Alphabetical List }
-    {alphabetical list of the QDoc commands}.
-
-    \section1 Categories
+    appearance and logical structure.
 
     \list
-    \o \l {Markup Commands}
-    \o \l {Topical Commands}
-    \o \l {Contextual Commands}
+    \o \l {04-qdoc-commands-textmarkup.html#a-command} {\\a}
+    \o \l {11-qdoc-commands-specialcontent.html#abstract-command} {\\abstract}
+    \o \l {06-qdoc-commands-includecodeinline.html#badcode-command} {\\badcode}
+    \o \l {04-qdoc-commands-textmarkup.html#bold-command} {\\bold}
+    \o \l {11-qdoc-commands-specialcontent.html#brief-command} {\\brief}
+    \o \l {04-qdoc-commands-textmarkup.html#c-command} {\\c}
+    \o \l {09-qdoc-commands-includingimages.html#caption-command} {\\caption}
+    \o \l {05-qdoc-commands-documentstructure.html#chapter-command} {\\chapter}
+    \o \l {06-qdoc-commands-includecodeinline.html#code-command} {\\code}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#codeline-command} {\\codeline}
+    \o \l {04-qdoc-commands-textmarkup.html#div-command} {\\div} \span {class="newStuff"} {(new)}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#dots-command} {\\dots}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#else-command} {\\else}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#endif-command} {\\endif}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#expire-command} {\\expire}
+    \o \l {11-qdoc-commands-specialcontent.html#footnote-command} {\\footnote}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist-command} {\\generatelist}
+    \o \l {10-qdoc-commands-tablesandlists.html#header-command} {\\header}
+    \o \l {04-qdoc-commands-textmarkup.html#i-command} {\\i}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#if-command} {\\if}
+    \o \l {09-qdoc-commands-includingimages.html#image-command} {\\image}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\include}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\input}
+    \o \l {09-qdoc-commands-includingimages.html#inlineimage-command} {\\inlineimage}
+    \o \l {08-qdoc-commands-creatinglinks.html#keyword-command} {\\keyword}
+    \o \l {08-qdoc-commands-creatinglinks.html#l-command} {\\l}
+    \o \l {11-qdoc-commands-specialcontent.html#legalese-command} {\\legalese}
+    \o \l {10-qdoc-commands-tablesandlists.html#list-command} {\\list}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#meta-command} {\\meta}
+    \o \l {06-qdoc-commands-includecodeinline.html#newcode-command} {\\newcode}
+    \o \l {10-qdoc-commands-tablesandlists.html#o-command} {\\o}
+    \o \l {06-qdoc-commands-includecodeinline.html#oldcode-command} {\\oldcode}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#omit-command} {\\omit}
+    \o \l {05-qdoc-commands-documentstructure.html#part-command} {\\part}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printline-command} {\\printline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printto-command} {\\printto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printuntil-command} {\\printuntil}
+    \o \l {11-qdoc-commands-specialcontent.html#quotation-command} {\\quotation}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefile-command} {\\quotefile}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command} {\\quotefromfile}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\raw} \span {class="newStuff"} {(deprecated)}
+    \o \l {10-qdoc-commands-tablesandlists.html#row-command} {\\row}
+    \o \l {08-qdoc-commands-creatinglinks.html#sa-command} {\\sa}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionOne-command} {\\section1}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionTwo-command} {\\section2}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionThree-command} {\\section3}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionFour-command} {\\section4}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipline-command} {\\skipline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipto-command} {\\skipto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipuntil-command} {\\skipuntil}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#snippet-command} {\\snippet}
+    \o \l {04-qdoc-commands-textmarkup.html#span-command} {\\span} \span {class="newStuff"} {(new)}
+    \o \l {04-qdoc-commands-textmarkup.html#sub-command} {\\sub}
+    \o \l {04-qdoc-commands-textmarkup.html#sup-command} {\\sup}
+    \o \l {10-qdoc-commands-tablesandlists.html#table-command} {\\table}
+    \o \l {11-qdoc-commands-specialcontent.html#tableofcontents-command} {\\tableofcontents}
+    \o \l {08-qdoc-commands-creatinglinks.html#target-command} {\\target}
+    \o \l {04-qdoc-commands-textmarkup.html#tt-command} {\\tt}
+    \o \l {04-qdoc-commands-textmarkup.html#underline-command} {\\underline}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\unicode}
+    \o \l {11-qdoc-commands-specialcontent.html#warning-command} {\\warning}
+    \o \l {04-qdoc-commands-textmarkup.html#backslash-command} {\\\\}
     \endlist
 */
 
 /*!
-    \page 03-qdoc-commands-markup.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage QDoc Commands
-    \nextpage Text Formatting Commands
+    \page 04-qdoc-commands-textmarkup.html
+    \contentspage Table of Contents
+    \previouspage Markup Commands
+    \nextpage Document Structure
 
-    \title Markup Commands
+    \title Text Markup
 
-    The markup commands indicate the generated documentation's visual
-    appearance and logical structure.
+    The text formatting commands indicate how text is to be rendered.
 
-    \section1 Alphabetical List
-
-    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
-    \l {04-qdoc-commands-textformatting.html#a}{\\a},
-    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
-    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
-    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
-    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
-    \l {04-qdoc-commands-textformatting.html#c}{\\c},
-    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
-    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
-    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
-    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
-    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
-    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
-    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
-    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
-    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
-    \l {10-qdoc-commands-container.html#header}{\\header},
-    \l {04-qdoc-commands-textformatting.html#i}{\\i},
-    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
-    \l {09-qdoc-commands-graphic.html#image}{\\image},
-    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
-    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage},
-    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
-    \l {08-qdoc-commands-linking.html#l}{\\l},
-    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
-    \l {10-qdoc-commands-container.html#list}{\\list},
-    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
-    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
-    \l {10-qdoc-commands-container.html#o}{\\o},
-    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode},
-    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
-    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
-    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
-    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
-    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
-    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
-    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
-    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
-    \l {10-qdoc-commands-container.html#row}{\\row},
-    \l {08-qdoc-commands-linking.html#sa}{\\sa},
-    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
-    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
-    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
-    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4},
-    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
-    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
-    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
-    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
-    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
-    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
-    \l {10-qdoc-commands-container.html#table}{\\table},
-    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-       {\\tableofcontents},
-    \l {08-qdoc-commands-linking.html#target}{\\target},
-    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
-    \l {04-qdoc-commands-textformatting.html#underline}{\\underline},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode},
-    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+    \target a-command
+    \section1 \\a (parameter marker)
 
-    \section1 Categories
-    \list
-    \o \l {Text Formatting Commands}
-    \o \l {Document Structuring Commands}
-    \o \l {Verbatim Code Commands}
-    \o \l {Quoting External Code Commands}
-    \o \l {Linking Commands}
-    \o \l {Graphic Commands}
-    \o \l {Container Commands}
-    \o \l {Document Contents Commands}
-    \o \l {Miscellaneous Commands}
-    \endlist
+    The \\a command tells QDoc the next word is a formal parameter name.
 
-*/
+    A warning is emitted when a formal parameter is not documented or
+    is misspelled, so when you document a function you should mention
+    each formal parameter by name in the function description,
+    preceded by the \\a command. The parameter name is then rendered
+    in italics.
 
-/*!
-    \page 04-qdoc-commands-textformatting.html
-    \contentspage QDoc Manual - Table of Contents
-    \previouspage Markup Commands
-    \nextpage Document Structuring Commands
+    \code
+      / *!
+         Constructs a line edit containing the text
+         \a contents. The \a parent parameter is sent 
+         to the QWidget constructor.
+      * /
 
-    \title Text Formatting Commands
+      QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)
+      {
+         ...
+      }
 
-    The text formatting commands indicate how the regular text in the
-    documentation is rendered.
+    \endcode
 
-    \section1 Alphabetical List
+    QDoc renders this as:
 
-    \l {04-qdoc-commands-textformatting.html#backslash}{\\\\},
-    \l {04-qdoc-commands-textformatting.html#a}{\\a},
-    \l {04-qdoc-commands-textformatting.html#bold}{\\bold},
-    \l {04-qdoc-commands-textformatting.html#c}{\\c},
-    \l {04-qdoc-commands-textformatting.html#i}{\\i},
-    \l {04-qdoc-commands-textformatting.html#sub}{\\sub},
-    \l {04-qdoc-commands-textformatting.html#sup}{\\sup},
-    \l {04-qdoc-commands-textformatting.html#tt}{\\tt},
-    \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
+    \quotation
+        \bold {QLineEdit::QLineEdit ( const QString &
+        contents, QWidget *parent )}
 
-    \section1 Command Descriptions
+        Constructs a line edit containing the text \a contents.
+        The \a parent parameter is sent to the QWidget constructor.
+    \endquotation
 
-    \table
-    \header
-        \o Command
-        \o Description
+    You can enclose the formal parameter name in curly brackets, if
+    you want to, but it isn't necessary.
 
-    \row
+    \target c-command
+    \section1 \\c (code font)
+    
+    The \\c command is used for rendering variable names, user-defined
+    class names, and C++ keywords (e.g. \c int and \c for) in the code
+    font.
 
-        \o \bold \\\\ \target backslash
-        \o \bold {The \\\\ command expands to a single backslash.}
+    The command renders its argument using a typewriter font. For
+    example:
 
-           QDoc commands always start with a backslash alone. To
-           display an actual backslash in the text you need to type
-           two of the kind. If you want to display two backslashes,
-           you need to type four, and so forth. For example:
+    \code
+      / *!
+        The \c AnalogClock class provides a clock widget with hour
+        and minute hands that is automatically updated every
+        few seconds.
+      * /
+    \endcode
 
-           \code
-           / *!
-               The \\\\ command is useful if you want a
-               backslash to appear verbatim, for example,
-               writing C:\\windows\\home\\.
-           * /
-           \endcode
+    QDoc renders this as:
 
-           will be rendered as
+    \quotation
+        The \c AnalogClock class provides a clock widget with hour
+        and minute hands that is automatically updated every
+        few seconds.
+    \endquotation
 
-           \quotation
-               The \\\\ command is useful if you want a
-               backslash to appear verbatim, for example,
-               writing C:\\windows\\home\\.
-           \endquotation
+    If the text to be rendered in the code font contains spaces, enclose the
+    entire text in curly brackets.
 
-           However, if you want your text to appear in a typewriter
-           font as well, you can use the \l {c}{\\c} command instead,
-           which accepts and renders the backslash as any other
-           character. For example:
+    \code
+      \c {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endcode
 
-           \code
-           / *!
-               The \\c command is useful if you want a
-               backslash to appear verbatim, and the word
-               that contains it written in a typewriter font,
-               like this: \c {C:\windows\home\}.
-           * /
-           \endcode
+    QDoc renders this as:
 
-           will be rendered as
+    \quotation
+      \c {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endquotation
 
-           \quotation
-               The \\c command is useful if you want a
-               backslash to appear verbatim, and the word
-               that contains it written in a typewriter font,
-               like this: \c {C:\windows\home\}.
-           \endquotation
+    The \\c command accepts the special character \c \ within its
+    argument, i.e. it renders it as a normal character. So if you want
+    to use nested commands, you must use the \l {tt-command} {teletype
+    (\\tt)} command instead.
 
-    \row
-        \o \bold \\a \target a
-        \o \bold {The \\a command indicates that the next word
-           is a parameter when documenting functions.}
+    See also \l {tt-command} {\\tt} and \l {code-command} {\\code}.
+ 
+    \target div-command
+    \section1 \\div \span {class="newStuff"} {(new)}  
+ 
+    The \\div and \\enddiv commands delimit a large or small block of
+    text (which may include other QDoc commands) to which special
+    formatting attributes should be applied.
 
-           Warnings are emitted when function parameters are
-           undocumented or misspelled, so whenever you write
-           documentation for functions you should make sure you
-           mention all the parameters and precede each of these by the
-           \\a command. The parameter is then rendered in italic. For
-           example:
+    An argument must be provided in curly braces, as in the qdoc
+    comment shown below. The argument is not interpreted but is used
+    as attribute(s) of the tag that is ultimately output by qdoc.
 
-           \code
-           / *!
-               Constructs a line edit containing the text
-               \a contents.
+    For example, we might want to render an inline image so that it
+    floats to the right of the current block of text:
 
-               The \a parent parameter is sent to the
-               QWidget constructor.
-           * /
+    \code
+      / *!
+         \div {class="float-right"}
+           \inlineimage qml-column.png
+         \enddiv
 
-           QLineEdit::QLineEdit(const QString &contents, QWidget *parent)
-               :QWidget(parent)
-           {
-               ...
-           }
+      * /
+    \endcode
 
-           \endcode
+    If qdoc is generating HTML, it will translate these commands to:
 
-           will be rendered as
+    \code
+      <div class="float-right"><p><img src="images/qml-column.png" /></p></div>
+    \endcode
 
-           \quotation
-               \bold {QLineEdit::QLineEdit ( const QString &
-               contents, QWidget *parent )}
+    For HTML, the attribute value \e {float-right} then will refer to
+    a clause in the style.css file. which in this case could be:
 
-           Constructs a line edit containing the text \a contents.
+    \code	   
+       div.float-right
+       {
+          float: right; margin-left: 2em
+       }
+    \endcode
 
-           The \a parent parameter is sent to the QWidget
-           constructor.
+    If qdoc is generating DITA XML, it will translate the commands to:
 
-           \endquotation
+    \code
+        <sectiondiv outputclass="float-right">
+            <p>
+                <fig>
+                    <image href="images/qml-column.png" placement="inline"/>
+                </fig>
+            </p>
+        </sectiondiv>
+    \endcode
 
-           The \\a command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument. However, a parameter
-           is always a single word, so braces are rarely
-           necessary. And for the same reason, parentheses seldom
-           occur.
+    Your DITA XML publishing program must then recognize the \e
+    {outputclass} attribute value.
 
-    \row
-        \o \bold \\c \target c
-        \o \bold {The \\c command can be used to render variables,
-           user-defined classes and C++ keywords like \c int,
-           \c for, etc.}
+    \note The \bold {\\div} command can be nested. 
+	   
+    Below is an example taken from the index.qdoc file used to
+    generate index.html for Qt 4.7:
 
-           The command renders its argument using a typewriter font. For
-           example:
+    \code
+        \div {class="indexbox guide"}
+            \div {class="heading"}
+                Qt Developer Guide 
+	    \enddiv
+            \div {class="indexboxcont indexboxbar"}
+                \div {class="section indexIcon"} \emptyspan
+                \enddiv
+                \div {class="section"}
+                    Qt is a cross-platform application and UI
+                    framework. Using Qt, you can write web-enabled
+                    applications once and deploy them across desktop,
+                    mobile and embedded operating systems without
+                    rewriting the source code.
+                \enddiv
+                \div {class="section sectionlist"}
+                    \list
+                       \o \l{Getting Started Guides} {Getting started}
+                       \o \l{Installation} {Installation}
+                       \o \l{how-to-learn-qt.html} {How to learn Qt}
+                       \o \l{tutorials.html} {Tutorials}
+                       \o \l{Qt Examples} {Examples}
+                       \o \l{qt4-7-intro.html} {What's new in Qt 4.7}
+                    \endlist
+                \enddiv
+            \enddiv
+        \enddiv
+    \endcode
 
-           \code
-           / *!
-               The \c AnalogClock class provides a clock widget with hour
-               and minute hands that is automatically updated every
-               few seconds.
-           * /
-           \endcode
+    When all the class attribute values are defined as they are in the
+    style.css file that is used for rendering the Qt 4.7 documentation, 
+    the above example is rendered as:
+
+          \div {class="indexbox guide"}
+            \div {class="heading"}
+              Qt Developer Guide 
+	    \enddiv
+            \div {class="indexboxcont indexboxbar"}
+              \div {class="section indexIcon"} \emptyspan
+              \enddiv
+              \div {class="section"}
+                Qt is a cross-platform application and UI
+                framework. Using Qt, you can write web-enabled
+                applications once and deploy them across desktop,
+                mobile and embedded operating systems without
+                rewriting the source code.
+              \enddiv
+              \div {class="section sectionlist"}
+                \list
+                  \o \l{Getting Started Guides} {Getting started}
+                  \o \l{Installation} {Installation}
+                  \o \l{how-to-learn-qt.html} {How to learn Qt}
+                  \o \l{tutorials.html} {Tutorials}
+                  \o \l{Qt Examples} {Examples}
+                  \o \l{qt4-7-intro.html} {What's new in Qt 4.7}
+                \endlist
+             \enddiv
+            \enddiv
+          \enddiv
+
+    When generating DITA XML, qdoc outputs the nested \e {div} commands as:
 
-           will be rendered as
+    \code
+      <sectiondiv outputclass="indexbox guide">
+          <sectiondiv outputclass="heading">
+              <p>Qt Developer Guide</p>
+          </sectiondiv>
+          <sectiondiv outputclass="indexboxcont indexboxbar">
+              <sectiondiv outputclass="section indexIcon"/>
+              <sectiondiv outputclass="section">
+                  <p>Qt is a cross-platform application and UI
+                     framework. Using Qt, you can write
+                     web-enabled applications once and deploy
+                     them across desktop, mobile and embedded
+                     operating systems without rewriting the
+                     source code.
+                  </p>
+              </sectiondiv>
+              <sectiondiv outputclass="section sectionlist">
+                  <ul>
+                      <li>
+                          <xref href="gettingstarted.xml#id-606ee7a8-219b-47b7-8f94-91bc8c76e54c">Getting started</xref>
+                      </li>
+                      <li>
+                          <xref href="installation.xml#id-075c20e2-aa1e-4f88-a316-a46517e50443">Installation</xref>
+                      </li>
+                      <li>
+                          <xref href="how-to-learn-qt.xml#id-49f509b5-52f9-4cd9-9921-74217b9a5182">How to learn Qt</xref>
+                      </li>
+                      <li>
+                          <xref href="tutorials.xml#id-a737f955-a904-455f-b4aa-0dc69ed5a64f">Tutorials</xref>
+                      </li>
+                      <li>
+                          <xref href="all-examples.xml#id-98d95159-d65b-4706-b08f-13d80080448d">Examples</xref>
+                      </li>
+                      <li>
+                          <xref href="qt4-7-intro.xml#id-519ae0e3-4242-4c2a-b2be-e05d1e95f177">What's new in Qt 4.7</xref>
+                      </li>
+                  </ul>
+              </sectiondiv>
+          </sectiondiv>
+      </sectiondiv>
+    \endcode
 
-           \quotation
-               The \c AnalogClock class provides a clock widget with hour
-               and minute hands that is automatically updated every
-               few seconds.
-           \endquotation
+    Your DITA XML publishing program must recognize the values of the
+    \e {outputclass} attribute.
+           
+    See also \l {span-command} {\\span}.
 
-           The \\c command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    \target span -command
+    \section1 \\span \span {class="newStuff"} {(new)} 
+    
+    The \\span command is for applying special formatting
+    attributes to a small block of text.
+
+    Two arguments must be provided, each argument in curly braces, as
+    shown in the qdoc comment below. The first argument is not
+    interpreted but is used as the formatting attribute(s) of the tag
+    that is ultimately output by qdoc. The second argument is the text
+    to be rendered with the special formatting attributes.
+	   
+    For example, we might want to render the first word of each
+    element in a numeric list in blue.
 
-           The \\c command accepts the special character \c \ within
-           its argument, i.e. it renders it as a normal character. So
-           if you want to use nested commands, you must use the \l
-           {tt}{teletype (\\tt)} command instead.
+    \code
+        / *!
+            Global variables with complex types:
+	    \list 1
+                \o \span {class="variableName"} {mutableComplex1} in globals.cpp at line 14
+                \o \span {class="variableName"} {mutableComplex2} in globals.cpp at line 15
+                \o \span {class="variableName"} {constComplex1} in globals.cpp at line 16
+                \o \span {class="variableName"} {constComplex2} in globals.cpp at line 17
+            \endlist
+        * /
+    \endcode
 
-           See also \l {tt}{\\tt} and \l {code}{\\code}.
+    Class \e {variableName} refers to a clause in your style.css. 
 
-    \row
-        \o \bold \\tt \target tt
-        \o \bold {The \\tt command can be used to render variables,
-           user-defined classes and C++ keywords like \c int, \c
-           for, etc.}
+    \code
+        .variableName
+        {
+            font-family: courier;
+	    color: blue
+        }
+    \endcode
 
-           The \\tt command behaves just like the \l {c}{\\c} command,
-           except that \\tt parses QDoc commands (like \l {i}{\\i}, \l
-           {bold}{\\bold} and \l {underline}{\\underline}) contained
-           within its argument.
+    Using the \e {variableName} clause shown above, the example is rendered as:
 
-           The command renders its argument using a monospace
-           font. For example:
+    Global variables with complex types:
+    \list 1
+        \o \span {class="variableName"} {mutableComplex1} in globals.cpp at line 14
+        \o \span {class="variableName"} {mutableComplex2} in globals.cpp at line 15
+        \o \span {class="variableName"} {constComplex1} in globals.cpp at line 16
+        \o \span {class="variableName"} {constComplex2} in globals.cpp at line 17
+    \endlist
 
-           \code
-           / *!
-               After \c setupUi() populates the main container with
-               child widgets it scans the main container's list of
-               slots for names with the form
-               \tt{on_\i{objectName}_\i{signalName}().}
-           * /
-           \endcode
+    \note The \bold span command does not cause a new paragraph to be
+    started.
 
-           will be rendered as
+    See also \l {div-command} {\\div}.
+           
+    \target tt-command
+    \section1 \\tt (teletype font)
 
-           \quotation
-               After \c setupUi() populates the main container with
-               child widgets it scans the main container's list of
-               slots for names with the form
-               \tt{on_\i{objectName}_\i{signalName}().}
-           \endquotation
+    The \\tt command renders its argument in a monospace font. This
+    command behaves just like the \l {c-command} {\\c} command, except
+    that \\tt allows you to nest QDoc commands within the argument
+    (e.g. \l {i-command} {\\i}, \l {bold-command} {\\bold} and \l
+    {underline-command} {\\underline}).
 
-           The \\tt command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+    \code
+       / *!
+           After \c setupUi() populates the main container with
+           child widgets it scans the main container's list of
+           slots for names with the form
+           \tt{on_\e{objectName}_\e{signalName}().}
+       * /
+    \endcode
 
-           See also \l {c}{\\c}.
+    QDoc renders this as:
 
-    \row
-        \o \bold \\bold \target bold
-        \o \bold {The \\bold command renders its argument using
-           a bold font.}
+    \quotation
+        After \c setupUi() populates the main container with
+        child widgets it scans the main container's list of
+        slots for names with the form
+        \tt{on_\e{objectName}_\e{signalName}().}
+    \endquotation
 
-           For example:
+    If the text to be rendered in the code font contains spaces, enclose the
+    entire text in curly brackets.
 
-           \code
-           / *!
-               This is regular text; \bold {this text is
-               rendered using the \\bold command}.
-           * /
-           \endcode
+    \code
+      \tt {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-           This is regular text; \bold {this text is rendered using
-           the \\bold command}.
-           \endquotation
+    \quotation
+      \tt {QLineEdit::QLineEdit(const QString &contents, QWidget *parent) :QWidget(parent)}
+    \endquotation
 
-           The command follows the same conventions as the \l {i}{\\i}
-           command for \l {argument}{punctuation, parentheses and use
-           of braces} for the argument.
+    See also \l {c-command} {\\c}.
 
-    \row
-        \o \bold \\i \target i
-        \o \bold {The \\i command renders its argument in italic.}
+    \target bold-command
+    \section1 \\bold 
 
-           \warning This is preliminary functionality. For
-           more information, see the \l
-           {26-qdoc-commands-compatibility.html#i-versus-e}{compatibility}
-           section.
+    The \\bold command renders its argument in bold font.
 
-           \target argument
-           Normally, a command argument ends at the next whitespace [1],
-           but braces can be used to group words [2]. For example:
+    \code
+    / *!
+        This is regular text; \bold {this text is
+        rendered using the \\bold command}.
+    * /
+    \endcode
 
-           \code
-           / *!
-               Here, we render \i {a few words} in italic.
-           * /
-           \endcode
+    QDoc renders this as:
 
-           will be rendered as
+    \quotation
+    This is regular text; \bold {this text is rendered using
+    the \\bold command}.
+    \endquotation
 
-           \quotation
-               Here, we render \i {a few words} in italic.
-           \endquotation
+    \target i-command
+    \section1 \\i (italics)
 
-           If you want to use other QDoc commands within an argument
-           that contains spaces, you always need to enclose the
-           argument with braces. But QDoc is smart enough to count
-           parentheses [3], so you don't need braces in cases like this:
+    The \\i command renders its argument in italics.
 
-           \code
-           / *!
-               An argument can sometimes contain whitespaces,
-               for example: \i QPushButton(tr("A Brand New Button"))
-           * /
-           \endcode
+    \warning If \\i doesn't work and you get some strange error
+    meesages from qdoc3 about using \\o outside of tables and lists,
+    use \bold{\\e} for italics instead of \\i. For more information,
+    see the relevant explanation in the section on \l
+    {26-qdoc-commands-compatibility.html#i-versus-e} {compatibility
+    issues}.
 
-           will be rendered as
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           \quotation
-               An argument can sometimes contain whitespaces,
-               for example: \i QPushButton(tr("A Brand New Button"))
-           \endquotation
+    \code
+    / *!
+        Here, we render \i {a few words} in italic.
+    * /
+    \endcode
 
-           Finally, trailing punctuation is not included in an
-           argument [4], nor is 's [5]
+    QDoc renders this as:
 
-           \raw HTML
-               <table align="center" cellpadding="2"
-                   cellspacing="1" border="0">
-               <tr valign="top" bgcolor="#a2c511">
-                   <th></th>
-                   <th>QDoc Syntax</th>
-                   <th>Generated Documentation</th>
-               </tr>
+    \quotation
+        Here, we render \e {a few words} in italic.
+    \endquotation
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>1</td>
-                   <td>A variation of a command button is a \i menu
-                       button.</td>
-                   <td>A variation of a command button is a <i>menu</i>
-                       button.</td>
-               </tr>
+    If you want to use other QDoc commands within an argument that
+    contains spaces, you always need to enclose the argument with
+    braces. But QDoc is smart enough to count parentheses [3], so you
+    don't need braces in cases like this:
 
-               <tr valign="top" bgcolor="#c0c0c0">
-                   <td>2</td>
-                   <td>The QPushButton widget provides a
-                       \i {command button}.</td>
-                   <td>The QPushButton widget provides a
-                       <i>command button</i>.</td>
-               </tr>
+    \code
+    / *!
+        An argument can sometimes contain whitespaces,
+        for example: \i QPushButton(tr("A Brand New Button"))
+    * /
+    \endcode
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>3</td>
-                   <td>Another class of buttons are option buttons
-                       \i (see QRadioButton).</td>
-                   <td>Another class of buttons are option buttons
-                       <i> (see QRadioButton)</i>.</td>
-               </tr>
+    QDoc renders this as:
 
-               <tr valign="top" bgcolor="#c0c0c0">
-                   <td>4</td>
-                   <td>A push button emits the signal \i clicked().</td>
-                   <td>A push button emits the signal <i>clicked</i>().</td>
-               </tr>
+    \quotation
+       An argument can sometimes contain whitespaces,
+       for example: \e QPushButton(tr("A Brand New Button"))
+    \endquotation
 
-               <tr valign="top" bgcolor="#d0d0d0">
-                   <td>5</td>
-                   <td>The \i QPushButton's checked property is
-                       false by default.</td>
-                   <td>The <i>QPushButton</i>'s checked property is
-                       false by default.</td>
-               </tr>
+    Finally, trailing punctuation is not included in an argument [4],
+    nor is 's [5]
 
-               </table>
-           \endraw
+    \raw HTML
+        <table align="center" cellpadding="2"
+           cellspacing="1" border="0">
+        <tr valign="top" bgcolor="#a2c511">
+            <th></th>
+            <th>QDoc Syntax</th>
+            <th>Generated Documentation</th>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+           <td>1</td>
+            <td>A variation of a command button is a \e menu
+                button.</td>
+            <td>A variation of a command button is a <i>menu</i>
+                button.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#c0c0c0">
+            <td>2</td>
+            <td>The QPushButton widget provides a
+                \e {command button}.</td>
+            <td>The QPushButton widget provides a
+                <i>command button</i>.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+            <td>3</td>
+            <td>Another class of buttons are option buttons
+                \e (see QRadioButton).</td>
+            <td>Another class of buttons are option buttons
+                <i> (see QRadioButton)</i>.</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#c0c0c0">
+            <td>4</td>
+            <td>A push button emits the signal \e clicked().</td>
+            <td>A push button emits the signal <i>clicked</i>().</td>
+        </tr>
+
+        <tr valign="top" bgcolor="#d0d0d0">
+            <td>5</td>
+            <td>The \e QPushButton's checked property is
+                false by default.</td>
+            <td>The <i>QPushButton</i>'s checked property is
+                false by default.</td>
+        </tr>
 
-    \row
-        \o \bold \\sub \target sub
-        \o \bold {The \\sub command renders its argument lower
-           than the baseline of the regular text, using a smaller font.}
+        </table>
+    \endraw
 
-           For example:
+    \target sub-command
+    \section1 \\sub 
 
-           \code
-           / *!
-               Definition (Range): Consider the sequence
-               {x\sub n}\sub {n > 1} . The set
+    The \\sub command renders its argument lower than the baseline of
+    the regular text, using a smaller font.
 
-               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+    \code
+    / *!
+        Definition (Range): Consider the sequence
+        {x\sub n}\sub {n > 1} . The set
 
-               is called the range of the sequence.
-           * /
-           \endcode
+        {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
 
-           will be rendered as
+        is called the range of the sequence.
+    * /
+    \endcode
 
-           \quotation
-               Definition (Range): Consider the sequence
-               {x\sub n}\sub {n > 1} . The set
+    QDoc renders this as:
 
-               {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
+    \quotation
+        Definition (Range): Consider the sequence
+        {x\sub n}\sub {n > 1} . The set
 
-               is called the range of the sequence.
-           \endquotation
+        {x\sub 2, x\sub 3, x\sub 4, ...} = {x\sub n ; n = 2, 3, 4, ...}
 
-           The \\sub command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+        is called the range of the sequence.
+    \endquotation
 
-    \row
-        \o \bold \\sup \target sup
-        \o \bold {The \\sup command renders its argument higher than
-           the baseline of the regular text, using a smaller font.}
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           For example:
+    \target sup-command
+    \section1 \\sup 
 
-           \code
-           / *!
-               The series
+    The \\sup command renders its argument higher than
+    the baseline of the regular text, using a smaller font.
 
-               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+    \code
+    / *!
+        The series
 
-               is called the \i {geometric series}.
-           * /
-           \endcode
+        1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
 
-           will be rendered as
+        is called the \i {geometric series}.
+    * /
+    \endcode
 
-           \quotation
-               The series
+    QDoc renders this as:
 
-               1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
+    \quotation
+        The series
 
-               is called the \i {geometric series}.
-           \endquotation
+        1 + a + a\sup 2 + a\sup 3 + a\sup 4 + ...
 
-           The \\sup command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation, parentheses
-           and use of braces} for the argument.
+        is called the \e {geometric series}.
+    \endquotation
 
-    \row
-        \o \bold \\underline \target underline
-        \o \bold {The \\underline command renders its argument underlined.}
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-           For example:
+    \target underline-command
+    \section1 \\underline
 
-           \code
-           / *!
-               The \underline {F}ile menu gives the users the possibility
-               to open, and edit, an existing file, save a new or modified
-               file, and exit the application.
-           * /
-           \endcode
+    The \\underline command renders its argument underlined.
 
-           will be rendered as
+    \code
+    / *!
+        The \underline {F}ile menu gives the users the possibility
+        to open, and edit, an existing file, save a new or modified
+        file, and exit the application.
+    * /
+    \endcode
 
-           \quotation
-               The \underline {F}ile menu gives the users the possibility
-               to open, and edit, an existing file, save a new or modified
-               file, and exit the application.
-           \endquotation
+    QDoc renders this as:
 
-           The \\underline command follows the same conventions as the
-           \l {i}{\\i} command for \l {argument}{punctuation,
-           parentheses and use of braces} for the argument.  \endtable
-*/
+    \quotation
+        The \underline {F}ile menu gives the users the possibility
+        to open, and edit, an existing file, save a new or modified
+        file, and exit the application.
+    \endquotation
 
-/*!
-    \page 05-qdoc-commands-documentstructuring.html
-    \previouspage Text Formatting Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Verbatim Code Commands
+    If the argument contains spaces or other punctuation, enclose the
+    argument in curly brackets.
 
-    \title Document Structuring Commands
+    \target backslash-command
+    \section1 \\\\ (double backslash) 
 
-    The document structuring commands divide the documentation into
-    sections. In total, there are six levels of sections in QDoc: \c
-    \part, \c \chapter, \c \section1, \c \section2, \c \section3 and
-    \c \section4. \c \section1 to \c \section4 correspond to the
-    traditional section, subsection, subsubsection and
-    subsubsubsection.
+    The \\\\ command expands to a single backslash.
 
-    \section1 Alphabetical List
+    QDoc commands always start with a backslash alone. To display an
+    actual backslash in the text you need to type two of the kind. If
+    you want to display two backslashes, you need to type four, and so
+    forth.
 
-    \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter},
-    \l {05-qdoc-commands-documentstructuring.html#part}{\\part},
-    \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1},
-    \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2},
-    \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3},
-    \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
+    \code
+    / *!
+        The \\\\ command is useful if you want a
+        backslash to appear verbatim, for example,
+        writing C:\\windows\\home\\.
+    * /
+    \endcode
 
-    \section1 Command Descriptions
+    QDoc renders this as:
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \quotation
+        The \\\\ command is useful if you want a
+        backslash to appear verbatim, for example,
+        writing C:\\windows\\home\\.
+    \endquotation
 
-    \row
-        \o \bold \\part \target part
-        \o \bold {The \\part command is intended for use in
-           larger documents, and divides the document into parts.}
+    However, if you want your text to appear in a typewriter font as
+    well, you can use the \l {c-command} {\\c} command instead, which
+    accepts and renders the backslash as any other character. For
+    example:
+
+    \code
+    / *!
+        The \\c command is useful if you want a
+        backslash to appear verbatim, and the word
+        that contains it written in a typewriter font,
+        like this: \c {C:\windows\home\}.
+    * /
+    \endcode
 
-           In general a document structuring command considers
-           everything that follows it until the first line break as
-           its argument. The argument is rendered as the unit's
-           title. If the title needs to be spanned over several lines,
-           make sure that each line (except the last one) is ended
-           with a backslash.
+    QDoc renders this as:
 
-           In total, there are six levels of sections in QDoc: \c
-           \part, \c \chapter, \c \section1, \c \section2, \c
-           \section3 and \c \section4. \c \section1 to \c \section4
-           correspond to the traditional section, subsection,
-           subsubsection and subsubsubsection.
+    \quotation
+        The \\c command is useful if you want a
+        backslash to appear verbatim, and the word
+        that contains it written in a typewriter font,
+        like this: \c {C:\windows\home\}.
+    \endquotation
 
-           There is a strict ordering of the section units:
+*/
+
+/*!
+    \page 05-qdoc-commands-documentstructure.html
+    \previouspage Text Markup
+    \contentspage Table of Contents
+    \nextpage Including Code Inline
+
+    \title Document Structure
+
+    The document structuring commands are for dividing your document
+    into sections. QDoc supports six kinds of sections: \c \part, \c
+    \chapter, \c \section1, \c \section2, \c \section3 and \c
+    \section4. The \c \section1..4 commands are the most useful. The
+    correspond to the traditional section, subsection, etc used in
+    outlining.
+
+    \target part-command
+    \section1 \\part 
+
+    The \\part command is intended for use in a large document, like a
+    book.
+
+    In general a document structuring command considers everything
+    that follows it until the first line break as its argument. The
+    argument is rendered as the unit's title. If the title needs to be
+    spanned over several lines, make sure that each line (except the
+    last one) is ended with a backslash.
+
+    In total, there are six levels of sections in QDoc: \c \part, \c
+    \chapter, \c \section1, \c \section2, \c \section3 and \c
+    \section4. \c \section1 to \c \section4 correspond to the
+    traditional section, subsection, subsubsection and
+    subsubsubsection.
+
+    There is a strict ordering of the section units:
 
            \code
            part
@@ -763,13 +960,12 @@
                                          section4
            \endcode
 
-           For example, a \c section1 unit can only appear as the top
-           level section or inside a \c chapter unit. Skipping a
-           section unit, for example from \c part to \c section1, is
-           not allowed.
+    For example, a \c section1 unit can only appear as the top level
+    section or inside a \c chapter unit. Skipping a section unit, for
+    example from \c part to \c section1, is not allowed.
 
-           You can \i begin with either of the three: \c part, \c
-           chapter or \c section1. For example:
+    You can \e begin with either of the three: \c part, \c chapter or
+    \c section1.
 
 
            \code
@@ -829,7 +1025,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
            \raw HTML
@@ -890,154 +1086,96 @@
            \endraw
            \endquotation
 
-           Each section level is a logical unit within the
-           document. Its title will appear on the table of contents
-           generated by the \l
-           {11-qdoc-commands-documentcontents.html#tableofcontents}
-           {\\tableofcontents} command. For example:
+    Each section is a logical unit in the document. The section
+    heading appears in the automatically generated table of contents
+    that normally appears in the upper righthand corner of the page.
 
-           \code
-           / *!
-               Contents:
+    \target chapter-command	
+    \section1 \\chapter 
+    
+    The \\chapter command is intended for use in
+    larger documents, and divides the document into chapters.
 
-               \tableofcontents
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-               ...
-            * /
-            \endcode
+    \target sectionOne-command
+    \section1 \\section1 
 
-            will expand to
+    The \\section1 command starts a new section.
 
-            \quotation
-            \raw HTML
-                <p>Contents:</p>
-
-                <ul>
-                <li><a href="#Basic Qt">Basic Qt</a></li>
-                    <ul>
-                    <li><a href="#Getting Started">Getting Started</a></li>
-                        <ul>
-                        <li><a href="#Hello Qt">Hello Qt</a></li>
-                        <li><a href="#Making Connections">
-                            Making Connections</a></li>
-                        <li><a href="#Using the Reference Documentation">
-                            Using the Reference Documentation</a></li>
-                        </ul>
-                    <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
-                        <ul>
-                        <li><a href="#Subclassing QDialog">
-                            Subclassing QDialog</a></li>
-                        </ul>
-                    </ul>
-                <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
-                    <ul>
-                    <li><a href="#Layout Management">
-                        Layout Management</a></li>
-                        <ul>
-                        <li><a href="#Basic Layouts">Basic Layouts</a></li>
-                        </ul>
-                    </ul>
-                </ul>
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-                ...
-            \endraw
-            \endquotation
-
-    \row
-        \o \bold \\chapter \target chapter
-        \o \bold {The \\chapter command is intended for use in
-           larger documents, and divides the document into chapters.}
+    \target sectionTwo-command
+    \section1 \\section2 
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    The \\section2 command starts a new section.
 
-    \row
-        \o \bold \\section1 \target sectionOne
-        \o \bold {The \\section1 command starts a new section.}
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
-    \row
-        \o \bold \\section2 \target sectionTwo
-        \o \bold {The \\section2 command starts a new section.}
+    \target sectionThree-command
+    \section1 \\section3 
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    The \\section3 command starts a new section.
 
-    \row
-        \o \bold \\section3 \target sectionThree
-        \o \bold {The \\section3 command starts a new section.}
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    \target sectionFour-command
+    \section1 \\section4 
 
-    \row
-        \o \bold \\section4 \target sectionFour
-        \o \bold {The \\section4 command starts a new section.}
+    The \\section4 command starts a new section.
 
-           See \l{part}{\\part} for an explanation of the various
-           section units, command argument and rendering.
+    See \l{part} {\\part} for an explanation of the various
+    section units, command argument and rendering.
 
-    \endtable
 */
 
 /*!
-    \page 06-qdoc-commands-verbatimcode.html
-    \previouspage Document Structuring Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Quoting External Code Commands
-
-    \title Verbatim Code Commands
-
-    The following commands are used to render verbatim code within the
-    documentation. The code is rendered on a new line, using a
-    typewriter font and the standard indentation.
+    \page 06-qdoc-commands-includecodeinline.html
+    \previouspage Document Structure
+    \contentspage Table of Contents
+    \nextpage Including External Code
+
+    \title Including Code Inline
+
+    The following commands are used to render source code without
+    formatting. The source code begins on a new line, rendered in the
+    code.
+
+    \bold{Note:} Although all these commands are for rendering C++
+    code, the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands are preferred over the others. These
+    commands allow equivalent code snippets for other Qt language
+    bindings to be substituted for the C++ snippets in the
+    documentation.
 
-    \bold{Note:} Although all of these commands can be used to present
-    C++ code, the \l{07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
-    and \l{07-0-qdoc-commands-quoting.html#codeline}{\\codeline} commands
-    should be used in preference to
-    the others when presenting valid code. This allows auxilliary tools
-    for Qt language bindings to substitute the relevant code snippets in
-    place of the C++ ones.
+    \target code-command
+    \section1 \\code 
 
-    \section1 Alphabetical List
+    The \\code and \\endcode commands enclose a snippet of source code.
 
-    \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode},
-    \l {06-qdoc-commands-verbatimcode.html#code}{\\code},
-    \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode},
-    \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
+    \note The \l {c-command} {\\c} command can be used for short code
+    fragments within a sentence. The \\code command is for longer code
+    snippets. It renders the code verbatim in a separate paragraph in
+    the code font.
 
-    \section1 Command Descriptions
+    When processing any of the \\code, \l {badcode-command}
+    {\\badcode}, \l {newcode-command} {\\newcode} or \l
+    {oldcode-command} {\\oldcode} commands, QDoc removes all
+    indentation that is common for the verbatim code blocks within a
+    \c{/}\c{*!} ...  \c{*}\c{/} comment before it adds the standard
+    indentation. For that reason the recommended style is to use 8
+    spaces for the verbatim code contained within these commands 
 
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\code \target code
-        \o \bold {The \\code command and the corresponding
-           \\endcode command delimit a piece of verbatim code.}
-
-           Whereas the \l {c}{\\c} command can be used for short code
-           fragments within a sentence, the \\code command is for
-           longer code snippets and renders the code verbatim in a
-           separate paragraph using a typewriter font and the standard
-           indentation.
-
-           When processing any of the \\code, \l {badcode}{\\badcode},
-           \l {newcode}{\\newcode} and \l {oldcode}{\\oldcode}
-           commands, QDoc basically removes all indentation that is
-           common for the verbatim code blocks within a \c{/}\c{*!} ...
-           \c{*}\c{/} comment before it adds the standard
-           indentation. For that reason the recommended style is to
-           use 8 spaces for the verbatim code contained within these
-           commands (note that this doesn't apply to externally
-           quoted code using the \l {quotefromfile}{\\quotefromfile}
-           or \l {quotefile}{\\quotefile} command).
-
-           For example:
+    \note This doesn't apply to externally quoted code using the \l
+    {quotefromfile-command} {\\quotefromfile} or \l
+    {quotefile-command} {\\quotefile} command.
 
            \code
            / *!
@@ -1053,7 +1191,7 @@
            * /
            \endcode
 
-           will be rendered as
+           QDoc renders this as:
 
            \code
                #include <QApplication>
@@ -1065,34 +1203,35 @@
                }
            \endcode
 
-           Other QDoc commands are disabled within
-           \\code... \\endcode, and the special character '\\' is
-           accepted and rendered like the rest of the code.
+    Other QDoc commands are disabled within \\code... \\endcode, and
+    the special character '\\' is accepted and rendered like the rest
+    of the code.
 
-           You need to type the code manually between the \\code and
-           \\endcode commands. If you want to include code snippets
-           from a particular file, use the \l
-           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
-           command instead.
+    To include code snippets from an external file, use the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands.
 
-           See also \l {c}{\\c}, \l
-           {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-           \l {badcode}{\\badcode}, \l {newcode}{\\newcode} and \l
-           {oldcode}{\\oldcode}.
+    See also \l {c-command} {\\c}, \l
+    {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command}
+    {\\quotefromfile}, \l {badcode-command} {\\badcode}, \l
+    {newcode-command} {\\newcode} and \l {oldcode-command}
+    {\\oldcode}.
 
-    \row
-        \o \bold \\badcode \target badcode
-        \o \bold {The \\badcode command and the corresponding
-           \\endcode command delimit a piece of code that doesn't
-           compile or is wrong for some other reason.}
+    \target badcode-command
+    \section1 \\badcode 
 
-           The \\badcode command is similar the \l {code}{\\code}
-           command, but renders the code using a grey font instead of
-           black (the default).
+    The \\badcode and \\endcode commands delimit a snippet of code
+    that doesn't compile or is wrong for some other reason.
 
-           Like the \l {code}{\\code} command, it renders its code on
-           a new line in the documentation using a typewriter font and
-           the standard indentation. For example:
+    The \\badcode command is similar to the \l {code-command} {\\code}
+    command, but it renders the code snippet using a grey font instead
+    of black.
+
+    Like the \l {code-command} {\\code} command, this command begins
+    its code snippet on a new line rendered in the code font and with
+    the standard indentation.
 
            \code
            / *!
@@ -1112,7 +1251,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The statement below is rendered using the
@@ -1130,30 +1269,29 @@
                \endcode
            \endquotation
 
-           Other QDoc commands are disabled within
-           \\badcode... \\endcode, and the special character '\\' is
-           accepted and rendered like the rest of the code.
+    Other QDoc commands are disabled within \\badcode... \\endcode,
+    and the special character '\\' is accepted and rendered like the
+    rest of the code.
 
-           See also \l {code}{\\code}, \l {newcode}{\\newcode} and \l
-           {oldcode}{\\oldcode}.
+    See also \l {code-command} {\\code}, \l {newcode-command}
+    {\\newcode} and \l {oldcode-command} {\\oldcode}.
 
-    \row
-        \o \bold \\newcode \target newcode
-        \o \bold {The \\newcode command, and the associated \\oldcode
-           and \\endcode commands, indicate how to port a piece of
-           code to a new version of an API.}
-
-           The \\newcode command, and its companion the \\oldcode
-           command, is a convenience combination of the \l
-           {code}{\\code} and \l {badcode}{\\badcode} commands: The
-           combination provides a text relating the two code snippets
-           to each other. The command requires a preceding \\oldcode
-           statement.
-
-           Like the \l {code}{\\code} and \l {badcode}{\\badcode}
-           commands, the \\newcode command renders its code on a new
-           line in the documentation using a typewriter font and the
-           standard indentation. For example:
+    \target newcode-command
+    \section1 \\newcode 
+
+    The \\newcode, \\oldcode, and \\endcode commands enable you to
+    show how to port a snippet of code to a new version of an API.
+
+    The \\newcode command, and its companion the \\oldcode command, is
+    a convenience combination of the \l {code-command} {\\code} and \l
+    {badcode-command} {\\badcode} commands: The combination provides a
+    text relating the two code snippets to each other. The command
+    requires a preceding \\oldcode statement.
+
+    Like the \l {code-command} {\\code} and \l {badcode-command}
+    {\\badcode} commands, the \\newcode command renders its code on a
+    new line in the documentation using a typewriter font and the
+    standard indentation.
 
            \code
            / *!
@@ -1168,7 +1306,7 @@
            * /
            \endcode
 
-           is rendered like this:
+    QDoc renders this as:
 
            \quotation
                \oldcode
@@ -1181,76 +1319,102 @@
                \endcode
            \endquotation
 
-           Other QDoc commands are disabled within
-           \\oldcode ... \\endcode, and the '\\' character doesn't need
-           to be escaped.
+    Other QDoc commands are disabled within \\oldcode ... \\endcode,
+    and the '\\' character doesn't need to be escaped.
 
-    \row
-        \o \bold \\oldcode \target oldcode
-        \o \bold {The \\oldcode command requires a corresponding
-           \\newcode statement; otherwise QDoc fails to parse the command
-           and emits a warning.}
+    \target oldcode-command
+    \section1 \\oldcode 
 
-           See also \l {newcode}{\\newcode} and \l {badcode}{\\badcode}.
-    \endtable
+    The \\oldcode command requires a corresponding
+    \\newcode statement; otherwise QDoc fails to parse the command
+    and emits a warning.
+
+    See also \l {newcode-command} {\\newcode} and \l {badcode-command} {\\badcode}.
+
+    \target qml-command
+    \section1 \\qml  \span {class="newStuff"} {(new)}
+
+    The \\qml and \\endqml commands enclose a snippet of QML source
+    code.  Currently, QDoc handles \\qml and \\endqml exactly the same
+    as \\code and \\endcode.
+
+    \code
+    / *!
+        \qml
+            import QtQuick 1.0
+
+            Row {
+                Rectangle {
+                    width: 100; height: 100
+                    color: "blue"
+                    transform: Translate { y: 20 }
+                }
+                Rectangle {
+                    width: 100; height: 100
+                    color: "red"
+                    transform: Translate { y: -20 }
+                }
+            }
+        \endqml
+    * /
+    \endcode
+
+    QDoc renders this as:
+
+    \qml
+        import QtQuick 1.0
+
+        Row {
+            Rectangle {
+                width: 100; height: 100
+                color: "blue"
+                transform: Translate { y: 20 }
+            }
+            Rectangle {
+                width: 100; height: 100
+                color: "red"
+                transform: Translate { y: -20 }
+            }
+        }
+    \endqml
 */
 
 /*!
-    \page 07-0-qdoc-commands-quoting.html
-    \previouspage Verbatim Code Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Linking Commands
+    \page 07-0-qdoc-commands-includingexternalcode.html
+    \previouspage Including Code Inline
+    \contentspage Table of Contents
+    \nextpage Creating Links
 
-    \title Quoting External Code Commands
+    \title Including External Code
 
-    The following commands enable quoting from files in the
-    documentation: You can make QDoc include the complete contents of
+    The following commands enable you to include code snippets from
+    external files. You can make QDoc include the complete contents of
     a file, or you can quote specific parts of the file and skip
     others. The typical use of the latter is to quote a file chunk by
     chunk.
 
-    \bold{Note:} Although all of these commands can be used to present
-    C++ code, the \l{#snippet}{\\snippet} and \l{#codeline}{\\codeline}
-    commands should be used in preference to
-    the others when presenting valid code. This allows auxilliary tools
-    for Qt language bindings to substitute the relevant code snippets in
-    place of the C++ ones.
-
-    \section1 Alphabetical List
-
-    \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \l {07-0-qdoc-commands-quoting.html#dots}{\\dots},
-    \l {07-0-qdoc-commands-quoting.html#printline}{\\printline},
-    \l {07-0-qdoc-commands-quoting.html#printto}{\\printto},
-    \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil},
-    \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile},
-    \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile},
-    \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline},
-    \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto},
-    \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil},
-    \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet}
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
+    \bold{Note:} Although all these commands are for rendering C++
+    code, the
+    \l{07-0-qdoc-commands-includingexternalcode.html#snippet-command}
+    {\\snippet} and
+    \l{07-0-qdoc-commands-includingexternalcode.html#codeline-command}
+    {\\codeline} commands are preferred over the others. These
+    commands allow equivalent code snippets for other Qt language
+    bindings to be substituted for the C++ snippets in the
+    documentation.
 
-    \row
-        \o \bold \\quotefile \target quotefile
-        \o \bold {The \\quotefile command expands to the complete
-           contents of the file given as argument.}
+    \target quotefile-command
+    \section1 \\quotefile 
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the file name with a line
-           break.
+    The \\quotefile command expands to the complete contents of the
+    file given as argument.
 
-           The file's contents is rendered in a separate paragraph,
-           using a typewriter font and the standard indentation. The
-           code is shown verbatim.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the file name with a line break.
 
-           For example:
+    The file's contents is rendered in a separate paragraph, using a
+    typewriter font and the standard indentation. The code is shown
+    verbatim.
 
            \code
            / *!
@@ -1263,7 +1427,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                This is a simple "Hello world" example:
@@ -1274,29 +1438,26 @@
                application up and running.
            \endquotation
 
-           \warning If you use the \l {QDoc
-           Compatibility}{compat.qdocconf} file this command is called
-           \\include.
+    See also \l {quotefromfile-command} {\\quotefromfile} and
+    \l {code-command} {\\code}.
 
-           See also \l {quotefromfile}{\\quotefromfile} and \l
-           {code}{\\code}.
 
-    \row
-        \o \bold \\quotefromfile \target quotefromfile
-        \o \bold {The \\quotefromfile command opens the file
-           given as argument for quoting.}
-
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the file name with a line
-           break.
-
-           The command is intended for use when quoting parts from
-           file with the walkthrough commands: \l
-           {printline}{\\printline}, \l {printto}{\\printto}, \l
-           {printuntil}{\\printuntil}, \l {skipline}{\\skipline}, \l
-           {skipto}{\\skipto}, \l {skipuntil}{\\skipuntil}. This
-           enables you to quote specific portions of a file. For
-           example:
+    \target quotefromfile-command
+    \section1 \\quotefromfile 
+
+    The \\quotefromfile command opens the file given as argument for
+    quoting.
+
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the file name with a line break.
+
+    The command is intended for use when quoting parts from file with
+    the walkthrough commands: \l {printline-command} {\\printline}, \l
+    {printto-command} {\\printto}, \l {printuntil-command}
+    {\\printuntil}, \l {skipline-command} {\\skipline}, \l
+    {skipto-command} {\\skipto}, \l {skipuntil-command}
+    {\\skipuntil}. This enables you to quote specific portions of a
+    file.
 
            \code
            / *!
@@ -1321,7 +1482,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within
@@ -1344,38 +1505,35 @@
                ...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           QDoc remembers which file it's quoting, and the current
-           position within that file (see \l {file}{\\printline} for
-           more information). There is no need to "close" the file.
+    QDoc remembers which file it's quoting, and the current position
+    within that file (see \l {file} {\\printline} for more
+    information). There is no need to "close" the file.
 
-           Earlier we called this command \\quotefile. For more
-           information, see the \l
-           {26-qdoc-commands-compatibility.html#quotefromfile-versus-quotefile}
-           {compatibility} section.
+    Earlier we called this command \\quotefile. For more information,
+    see the \l
+    {26-qdoc-commands-compatibility.html#quotefromfile-versus-quotefile}
+    {compatibility} section.
 
-           See also \l {quotefile}{\\quotefile}, \l {code}{\\code} and
-           \l {dots}{\\dots}.
+    See also \l {quotefile-command} {\\quotefile}, \l {code-command}
+    {\\code} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\printline \target printline
-        \o \bold {The \\printline command expands to the line
-           from the current position to the next non-blank line of
-           the current souce file.}
+    \target printline-command
+    \section1 \\printline 
 
-           To ensure that the documentation always is synchronized
-           with the source file, a substring of the line must be
-           specified as an argument to the command. Note that the
-           command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    The \\printline command expands to the line from the current
+    position to the next non-blank line of the current souce file.
 
-           The line from the source file is rendered as a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    To ensure that the documentation remains synchronized with the
+    source file, a substring of the line must be specified as an
+    argument to the command. Note that the command considers the rest
+    of the line as part of its argument, make sure to follow the
+    substring with a line break.
 
-           For example:
+    The line from the source file is rendered as a separate paragraph,
+    using a typewriter font and the standard indentation. The code is
+    shown verbatim.
 
            \code
            / *!
@@ -1403,7 +1561,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                There has to be exactly one QApplication object
@@ -1430,22 +1588,20 @@
                The main function...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
-
-           \target file
+    (\l {Example File} {The complete example file...})
 
-           QDoc reads the file sequentially. To move the current
-           position forward you can use either of the \l
-           {skipline}{\\skip...} commands. To move the current
-           position backward, you can use the \l
-           {quotefromfile}{\\quotefromfile} command again.
+    \target file
 
-           \target substring
+    QDoc reads the file sequentially. To move the current position
+    forward you can use either of the \l {skipline-command}
+    {\\skip...} commands. To move the current position backward, you
+    can use the \l {quotefromfile-command} {\\quotefromfile} command
+    again.
 
-           If the substring argument is surrounded by slashes it is
-           interpreted as a \l {regular expression}.
+    \target substring
 
-           For example:
+    If the substring argument is surrounded by slashes it is
+    interpreted as a \l {regular expression}.
 
            \code
            / *!
@@ -1462,7 +1618,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \quotefromfile widgets/scribble/mainwindow.cpp
@@ -1477,39 +1633,36 @@
                application.
            \endquotation
 
-           (\l {widgets/scribble}{The complete example file...})
+    (\l {widgets/scribble} {The complete example file...})
 
-           The regular expression \c /^\}/ makes QDoc print until the
-           first '}' character occurring at the beginning of the line
-           without indentation. /.../ encloses the regular expression,
-           and '^' means the beginning of the line. The '}' character
-           must be escaped since it is a special character in regular
-           expressions.
+    The regular expression \c /^\}/ makes QDoc print until the first
+    '}' character occurring at the beginning of the line without
+    indentation. /.../ encloses the regular expression, and '^' means
+    the beginning of the line. The '}' character must be escaped since
+    it is a special character in regular expressions.
 
-           QDoc will emit a warning if the specified substring or
-           regular expression cannot be located, i.e. if the source
-           code has changed.
+    QDoc will emit a warning if the specified substring or regular
+    expression cannot be located, i.e. if the source code has changed.
 
-           See also \l {printto}{\\printto} and \l
-           {printuntil}{\\printuntil}.
+    See also \l {printto-command} {\\printto} and \l
+    {printuntil-command} {\\printuntil}.
 
-    \row
-        \o \bold \\printto \target printto
-        \o \bold {The \\printto command expands to all the lines
-           from the current position up to and \i excluding the
-           next line containing a given substring.}
+    \target printto-command
+    \section1 \\printto 
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {file}{positioning} and \l {substring}{argument} as the \l
-           {printline}{\\printline} command.
+    The \\printto command expands to all the lines from the current
+    position up to and \e excluding the next line containing a given
+    substring.
 
-           The lines from the source file are rendered in a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {file}
+    {positioning} and \l {substring} {argument} as the \l
+    {printline-command} {\\printline} command.
 
-           For example:
+    The lines from the source file are rendered in a separate
+    paragraph, using a typewriter font and the standard
+    indentation. The code is shown verbatim.
 
            \code
            / *!
@@ -1524,7 +1677,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within the
@@ -1538,28 +1691,27 @@
                and \c argv parameters...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {printline}{\\printline} and \l
-           {printuntil}{\\printuntil}.
+    See also \l {printline-command} {\\printline} and \l
+    {printuntil-command} {\\printuntil}.
 
-    \row
-        \o \bold \\printuntil \target printuntil
-        \o \bold {The \\printuntil command expands to all the lines
-           from the current position up to and \i including the next line
-           containing a given substring.}
+    \target printuntil-command
+    \section1 \\printuntil 
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {file}{positioning} and \l {substring}{argument} as the \l
-           {printline}{\\printline} command.
+    The \\printuntil command expands to all the lines from the current
+    position up to and \e including the next line containing a given
+    substring.
 
-           The lines from the source file are rendered in a separate
-           paragraph, using a typewriter font and the standard
-           indentation. The code is shown verbatim.
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {file}
+    {positioning} and \l {substring} {argument} as the \l
+    {printline-command} {\\printline} command.
 
-           For example:
+    The lines from the source file are rendered in a separate
+    paragraph, using a typewriter font and the standard
+    indentation. The code is shown verbatim.
 
            \code
            / *!
@@ -1576,7 +1728,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within the
@@ -1587,33 +1739,33 @@
                \printuntil hello
 
                First we create a \l
-               {http://qt.nokia.com/doc/4.0/qapplication}{QApplication}
+               {http://qt.nokia.com/doc/4.0/qapplication} {QApplication}
                object using the \c argc and \c argv parameters, then we
                create a \l
-               {http://qt.nokia.com/doc/4.0/qpushbutton}{QPushButton}.
+               {http://qt.nokia.com/doc/4.0/qpushbutton} {QPushButton}.
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {printline}{\\printline} and \l
-           {printto}{\\printto}.
+    See also \l {printline-command} {\\printline} and \l
+    {printto-command} {\\printto}.
 
-    \row
-        \o \bold \\skipline \target skipline
-        \o \bold {The \\skipline command ignores the next non-blank
-           line in the current source file.}
-
-           Doc reads the file sequentially, and the \\skipline command
-           is used to move the current position (omitting a line of
-           the source file). See the remark about \l {file}{file
-           positioning} above.
-
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break. The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    \target skipline-command
+    \section1 \\skipline 
+
+    The \\skipline command ignores the next non-blank line in the
+    current source file.
+
+    Doc reads the file sequentially, and the \\skipline command is
+    used to move the current position (omitting a line of the source
+    file). See the remark about \l {file} {file positioning} above.
+
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break. The
+    command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command.
 
            \code
            / *!
@@ -1631,7 +1783,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \l
@@ -1649,30 +1801,30 @@
                that contains its definition.
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipto}{\\skipto}, \l
-           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+    See also \l {skipto-command} {\\skipto}, \l {skipuntil-command}
+    {\\skipuntil} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\skipto \target skipto
-        \o \bold {The \\skipto command ignores all the lines from the
-           current position up to and \i excluding the next line
-           containing a given substring.}
+    \target skipto-command
+    \section1 \\skipto 
 
-           QDoc reads the file sequentially, and the \\skipto command
-           is used to move the current position (omitting one or
-           several lines of the source file). See the remark about \l
-           {file}{file positioning} above.
+    The \\skipto command ignores all the lines from the current
+    position up to and \e excluding the next line containing a given
+    substring.
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    QDoc reads the file sequentially, and the \\skipto command is used
+    to move the current position (omitting one or several lines of the
+    source file). See the remark about \l {file} {file positioning}
+    above.
 
-           The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break.
+
+    The command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command.
 
            \code
            / *!
@@ -1691,7 +1843,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The whole application is contained within
@@ -1707,30 +1859,30 @@
                reasonable size ...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipline}{\\skipline}, \l
-           {skipuntil}{\\skipuntil} and \l {dots}{\\dots}.
+    See also \l {skipline-command} {\\skipline}, \l
+    {skipuntil-command} {\\skipuntil} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\skipuntil \target skipuntil
-        \o \bold {The \\skipuntil command ignores all the lines from
-           the current position up to and \i including the next line
-           containing a given substring.}
+    \target skipuntil-command
+    \section1 \\skipuntil 
 
-           QDoc reads the file sequentially, and the \\skipuntil
-           command is used to move the current position (omitting one
-           or several lines of the source file). See the remark about
-           \l {file}{file positioning} above.
+    The \\skipuntil command ignores all the lines from the current
+    position up to and \e including the next line containing a given
+    substring.
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the substring with a line
-           break.
+    QDoc reads the file sequentially, and the \\skipuntil command is
+    used to move the current position (omitting one or several lines
+    of the source file). See the remark about \l {file} {file
+    positioning} above.
 
-           The command also follows the same conventions for \l
-           {substring}{argument} as the \l {printline}{\\printline}
-           command, and it is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command. For example:
+    The command considers the rest of the line as part of its
+    argument, make sure to follow the substring with a line break.
+
+    The command also follows the same conventions for \l {substring}
+    {argument} as the \l {printline-command} {\\printline} command,
+    and it is used in conjunction with the \l {quotefromfile-command}
+    {\\quotefromfile} command.
 
            \code
            / *!
@@ -1748,7 +1900,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                The first thing we did in the \c main() function was to
@@ -1764,20 +1916,21 @@
                will return when the application exits...
            \endquotation
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           See also \l {skipline}{\\skipline}, \l {skipto}{\\skipto}
-           and \l {dots}{\\dots}.
+    See also \l {skipline-command} {\\skipline}, \l {skipto-command}
+    {\\skipto} and \l {dots} {\\dots}.
 
-    \row
-        \o \bold \\dots \target dots
-        \o \bold {The \\dots command indicates that parts of the
-           source file have been omitted when quoting a file.}
+    \target dots-command
+    \section1 \\dots 
 
-           The command is used in conjunction with the \l
-           {quotefromfile}{\\quotefromfile} command, and should be
-           stated on its own line. The dots are rendered on a new
-           line, using a typewriter font. For example:
+    The \\dots command indicates that parts of the source file have
+    been omitted when quoting a file.
+
+    The command is used in conjunction with the \l
+    {quotefromfile-command} {\\quotefromfile} command, and should be
+    stated on its own line. The dots are rendered on a new line, using
+    a typewriter font.
 
            \code
            / *!
@@ -1790,7 +1943,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotefromfile examples/main.cpp
            \skipto main
@@ -1799,54 +1952,54 @@
            \skipuntil exec
            \printline }
 
-           (\l {Example File}{The complete example file...})
+    (\l {Example File} {The complete example file...})
 
-           The default indentation is 4 spaces, but this can be
-           adjusted using the command's optional argument. For
-           example:
+    The default indentation is 4 spaces, but this can be adjusted
+    using the command's optional argument.
 
-            \code
-           / *!
-               \dots 0
-               \dots
-               \dots 8
-               \dots 12
-               \dots 16
-           * /
-           \endcode
+    \code
+    / *!
+        \dots 0
+        \dots
+        \dots 8
+        \dots 12
+        \dots 16
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \dots 0
-           \dots
-           \dots 8
-           \dots 12
-           \dots 16
+    \dots 0
+    \dots
+    \dots 8
+    \dots 12
+    \dots 16
 
-           See also \l {skipline}{\\skipline}, \l
-           {skipto}{\\skipto} and \l {skipuntil}{\\skipuntil}.
+    See also \l {skipline-command} {\\skipline}, \l {skipto-command}
+    {\\skipto} and \l {skipuntil-command} {\\skipuntil}.
 
-    \row
-        \o \bold \\snippet \target snippet
-        \o \bold {The \\snippet command causes a code snippet to be included
-           verbatim as preformatted text, which may be syntax highlighted.}
-           
-           Each code snippet are referenced by the file that holds it and by
-           a unique identifier for that file. Snippet files are typically
-           stored in a \c{snippets} directory inside the documentation
-           directory (e.g., \c{$QTDIR/doc/src/snippets}).
+    \target snippet-command
+    \section1 \\snippet 
+    
+    The \\snippet command causes a code snippet to be included
+    verbatim as preformatted text, which may be syntax highlighted.
 
-           For example, the following documentation references a snippet in
-           a file residing in a subdirectory of the documentation directory:
+    Each code snippet are referenced by the file that holds it and by
+    a unique identifier for that file. Snippet files are typically
+    stored in a \c{snippets} directory inside the documentation
+    directory (e.g., \c{$QTDIR/doc/src/snippets}).
+
+    For example, the following documentation references a snippet in a
+    file residing in a subdirectory of the documentation directory:
            
            \code
            \snippet snippets/textdocument-resources/main.cpp Adding a resource
            \endcode
            
-           The text following the file name is the unique identifier for the
-           snippet. This is used to delimit the quoted code in the relevant
-           snippet file as shown in the following example that corresponds to
-           the above \c{\\snippet} command:
+    The text following the file name is the unique identifier for the
+    snippet. This is used to delimit the quoted code in the relevant
+    snippet file as shown in the following example that corresponds to
+    the above \c{\\snippet} command:
            
            \dots
            \code
@@ -1859,18 +2012,20 @@
            //! [Adding a resource]
            \endcode
            \dots
-    \row
-        \o \bold \\codeline \target codeline
-        \o \bold{The \\codeline command inserts a blank line of preformatted
-           text. It is used to insert gaps between snippets without closing
-           the current preformatted text area and opening a new one.}
-    \endtable
+
+    \target codeline-command
+    \section1 \\codeline 
+
+    The \\codeline command inserts a blank line of preformatted
+    text. It is used to insert gaps between snippets without closing
+    the current preformatted text area and opening a new one.
+
 */
 
 /*!
     \page  07-1-example.html
-    \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Including External Code
+    \contentspage Table of Contents
 
     \title Example File
 
@@ -1878,541 +2033,528 @@
 */
 
 /*!
-    \page 08-qdoc-commands-linking.html
-    \previouspage Quoting External Code Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Graphic Commands
+    \page 08-qdoc-commands-creatinglinks.html
+    \previouspage Including External Code
+    \contentspage Table of Contents
+    \nextpage Including Images
 
-    \title Linking Commands
+    \title Creating Links
 
-    The linking commands make it possible to create hyperlinks to
-    classes, functions, header files and examples. They also make it
-    possible to link to targets within a document, as well as to other
-    documents and URLs.
+    These commands are for creating hyperlinks to classes, functions,
+    examples, and other targets. 
 
-    \section1 Alphabetical List
+    \target l-command
+    \section1 \\l (link)
 
-    \l {08-qdoc-commands-linking.html#keyword}{\\keyword},
-    \l {08-qdoc-commands-linking.html#l}{\\l},
-    \l {08-qdoc-commands-linking.html#sa}{\\sa},
-    \l {08-qdoc-commands-linking.html#target}{\\target}
+    The \\l link command is used to create a hyperlink to many
+    different kinds of targets. The command's general syntax is:
 
-    \section1 Command Descriptions
+    \code
+      \l {link target} {link text}
+    \endcode
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \code
+       / *!
+          Read the \l {http://qt.nokia.com/doc/4.0/}
+          {Qt's Reference Documentation} carefully.
+       * /
+    \endcode
 
-    \row
-        \o \bold \\l \target l
-        \o \bold {The \\l command is used to create hyperlinks. }
+    QDoc renders this as:
 
-           The command's general syntax is
+    \quotation
+       Read the \l {http://qt.nokia.com/doc/4.0/}
+       {Qt's Reference Documentation} carefully.
+    \endquotation
 
-           \code
-           \l {link target}{link text}
-           \endcode
+    If the link target is equivalent to the link text, the second
+    argument can be omitted.
 
-           For example:
+    For example, if you have documentation like:
 
-           \code
-           / *!
-               Read the \l {http://qt.nokia.com/doc/4.0/}
-               {Qt's Reference Documentation} carefully.
-           * /
-           \endcode
+    \code
+      / *!
+         \target assertions
 
-           will be rendered as
+         Assertions make some statement about the text at the
+         point where they occur in the regexp but they do not
+         match any characters.
 
-           \quotation
-              Read the \l {http://qt.nokia.com/doc/4.0/}
-              {Qt's Reference Documentation} carefully.
-           \endquotation
+         ...
 
-           If the link target is equivalent to the link text, the
-           second argument can be omitted.
+         Regexps are built up from expressions, quantifiers, and
+         \l {assertions} {assertions}.
+      * /
+    \endcode
 
-           For example, if you have documentation like:
+    You can simplify this as follows:
 
-           \code
-           / *!
-               \target assertions
+    \code
+      / *!
+        \target assertions
 
-               Assertions make some statement about the text at the
-               point where they occur in the regexp but they do not
-               match any characters.
+        Assertions make some statement about the text at the
+        point where they occur in the regexp but they do not
+        match any characters.
 
-               ...
+        ...
 
-               Regexps are built up from expressions, quantifiers, and
-               \l {assertions}{assertions}.
-           * /
-           \endcode
+        Regexps are built up from expressions, quantifiers, and
+        \l assertions.
+      * /
+    \endcode
 
-           you can rewrite it as
+    For the one-parameter version the braces can often be omitted.
+    The \\l command supports several kinds of links:
 
-           \code
-           / *!
-               \target assertions
+    \list
 
-               Assertions make some statement about the text at the
-               point where they occur in the regexp but they do not
-               match any characters.
+    \o \c {\l QWidget} - The name of a class documented with the \l
+    {class-command} {\\class} command.
 
-               ...
+    \o \c {\l QWidget::sizeHint()} - The name of a member function,
+    documented with or without an \l {fn-command} {\\fn} command.
 
-               Regexps are built up from expressions, quantifiers, and
-               \l assertions.
-           * /
-           \endcode
+    \o \c {\l <QtGlobal>} - The subject of a \l {headerfile-command}
+    {\\headerfile} command.
 
-           For the one-parameter version the braces can often
-           be omitted. See the \l {i}{\\i} command for the \l
-           {argument}{argument conventions}.
+    \o \c {\l widgets/wiggly} - The relative path used in an \l
+    {example-command} {\\example} command.
 
-           The \\l command supports several kinds of links:
+    \o \c {\l {QWidget Class Reference}} - The title used in a
+    \l {title-command} {\\title} command.
 
-           \list
-           \o \c {\l QWidget} - a defined \l {class}{\\class}
-           \o \c {\l QWidget::sizeHint()} - a defined member
-               function (\l {fn}{\\fn})
-           \o \c {\l <QtGlobal>} - a defined \l {headerfile}{\\headerfile}
-           \o \c {\l widgets/wiggly} - a defined
-              \l {example-command}{\\example}
-           \o \c {\l {QWidget Class Reference}} - a defined \l {title}{\\title}
-           \o \c {\l {Introduction}}- a defined \l{part}{\\part},
-              \l{chapter}{\\chapter} or \l {sectionOne}{\\section...}
-           \o \c {\l fontmatching} - a defined \l {target}{\\target}
-           \o \c {\l {Shared Classes}} - a defined \l {keyword}{\\keyword}
-           \o \c {\l network.html} - a defined \l {page}{\\page}
-           \o \c {\l http://www.trolltech.com/} - a URL
-           \endlist
+    \o \c {\l {Introduction to QDoc}}- The text from one of the
+    \l{part-command} {\\part}, \l{chapter} {\\chapter} or \l
+    {sectionOne-command} {\\section} commands.
 
-           QDoc also tries to make a link out of any words that don't
-           resemble any normal English words, for example Qt class
-           names or functions, like QWidget or QWidget::sizeHint(). In
-           these cases, the \\l command can actually be omitted, but
-           by using the command, you ensure that QDoc will emit a
-           warning if it cannot find the link target. In addition, if
-           you only want the function name to appear in the link, you
-           can use the following syntax:
+    \o \c {\l fontmatching} - The argument of a \l {target-command}
+    {\\target} command.
 
-           \list
-               \o \c {\l {QWidget::}{sizeHint()}}
-           \endlist
+    \o \c {\l {Shared Classes}} - A keyword named in a \l
+    {keyword-command} {\\keyword} command.
 
-           See also \l {sa}{\\sa}, \l {target}{\\target} and \l
-           {keyword}{\\keyword}.
+    \o \c {\l network.html} - The file name used in a \l
+    {page-command} {\\page} command.
 
-    \row
-        \o \bold \\sa \target sa
-        \o \bold {The \\sa command defines a list of links that will
-           be rendered in a separate "See also" section at the bottom
-           of the documentation.}
+    \o \c {\l http://www.trolltech.com/} - A URL.
 
-           The command takes a comma-separated list of links as its
-           argument. If the line ends with a comma, you can continue
-           on a second line.  The general syntax is:
+    \endlist
 
-           \code
-           \sa {the first link}, {the second link},
-               {the third link}, ...
-           \endcode
+    QDoc also tries to make a link out of any words that don't
+    resemble any normal English words, for example Qt class names or
+    functions, like QWidget or QWidget::sizeHint(). In these cases,
+    the \\l command can actually be omitted, but by using the command,
+    you ensure that QDoc will emit a warning if it cannot find the
+    link target. In addition, if you only want the function name to
+    appear in the link, you can use the following syntax:
 
-           QDoc will automatically try to generate "See also" links
-           interconnecting a property's various functions. For
-           example, an setVisible() function will automatically get a
-           link to visible() and vice versa.
+    \list
+        \o \c {\l {QWidget::} {sizeHint()}}
+    \endlist
 
-           In general, QDoc will generate "See also" links that
-           interconnect the functions that access the same
-           property. It recognizes four different syntax versions:
+    QDoc renders this as:
 
-           \list
-           \o \c property()
-           \o \c setProperty()
-           \o \c isProperty()
-           \o \c hasProperty()
-           \endlist
+    \quotation
+    \l {QWidget::} {sizeHint()}   
+    \endquotation
 
-           The \\sa command supports the same kind
-           of links as the \l {l}{\\l} command. For example:
+    See also \l {sa-command} {\\sa}, \l {target-command} {\\target}
+    and \l {keyword-command} {\\keyword}.
 
-           \code
-           / *!
-               Appends the actions \a actions to this widget's
-               list of actions.
 
-               \sa removeAction(), QMenu, addAction()
-           * /
-           void QWidget::addActions(QList<QAction *> actions)
-           {
-           ...
-           }
-           \endcode
+    \target sa-command
+    \section1 \\sa (see also)
 
-           will be rendered as
+    The \\sa command defines a list of links that will be rendered in
+    a separate "See also" section at the bottom of the documentation
+    unit.
 
-           \quotation
-               \bold {void QWidget::addActions ( QList<QAction*>
-               \i actions )}
+    The command takes a comma-separated list of links as its
+    argument. If the line ends with a comma, you can continue
+    the list on the next line.  The general syntax is:
 
-               Appends the actions \i actions to this widget's
-               list of actions.
+    \code
+    \sa {the first link}, {the second link},
+        {the third link}, ...
+    \endcode
 
-               See also \l {QWidget::removeAction()}{removeAction()},
-               \l QMenu, and \l {QWidget::addAction()}{addAction()}.
-           \endquotation
+    QDoc will automatically try to generate "See also" links
+    interconnecting a property's various functions. For example, a
+    setVisible() function will automatically get a link to visible()
+    and vice versa.
 
-           See also \l {l}{\\l}, \l {target}{\\target} and \l
-           {keyword}{\\keyword}.
+    In general, QDoc will generate "See also" links that interconnect
+    the functions that access the same property. It recognizes four
+    different syntax versions:
 
-    \row
-        \o \bold \\target \target target
-        \o \bold {The \\target command defines an explicit point in the
-           documentation that you can later link to using the \l {l}{\\l}
-           and \l {sa}{\\sa} commands.}
+    \list
+      \o \c property()
+      \o \c setProperty()
+      \o \c isProperty()
+      \o \c hasProperty()
+    \endlist
 
-           The command considers the rest of the line as part of its
-           argument, make sure to follow the target name with a line
-           break.
+    The \\sa command supports the same kind of links as the \l
+    {l-command} {\\l} command.
 
-           For example:
+    \code
+      / *!
+         Appends the actions \a actions to this widget's
+         list of actions.
+
+         \sa removeAction(), QMenu, addAction()
+      * /
+      void QWidget::addActions(QList<QAction *> actions)
+      {
+      ...
+      }
+    \endcode
 
-           \code
-           / *!
-               \target capturing parentheses
-               \section1 Capturing Text
+    QDoc renders this as:
 
-               Parentheses allow us to group elements together so that
-               we can quantify and capture them.
+    \quotation
+        \bold {void QWidget::addActions ( QList<QAction*>
+        \e actions )}
 
-               ...
-           * /
-           \endcode
+        Appends the actions \e actions to this widget's list of
+        actions.
 
-           can be referenced with
+        See also \l {QWidget::removeAction()} {removeAction()},
+        \l QMenu, and \l {QWidget::addAction()} {addAction()}.
+    \endquotation
 
-           \list
-           \o \c {\l {capturing parentheses}}
-              (from elsewhere in the same comment)
-           \o \c {\l qregexp.html#capturing-parentheses}
-              (from anywhere else)
-           \endlist
+    See also \l {l-command} {\\l}, \l {target-command} {\\target} and
+    \l {keyword-command} {\\keyword}.
 
-           within a documentation unit, and with
 
-           \list
-           \o \c {\l http://www.trolltech.com/4.0/doc/html/qregexp.html#capturing-parentheses}
-           \endlist
+    \target target-command
+    \section1 \\target 
 
-           on a more global scale.
+    The \\target command names a place in the documentation that you
+    can link to using the \l {l-command} {\\l (link)} and \l
+    {sa-command} {\\sa (see also)} commands.
 
-           If the target name does't contain any spaces, the brackets can
-           be omitted as well.
+    The text up to the line break becomes the target name. Be sure to
+    follow the target name with a line break. Curly brackets are not
+    required around the target name, but they may be required when the
+    target name is used in a link cammand. See below.
 
-           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
-           {keyword}{\\keyword}.
+    \code
+    / *!
+        \target capturing parentheses
+        \section1 Capturing Text
 
-    \row
-        \o \bold \\keyword \target keyword
-        \o \bold {The \\keyword command defines an explicit point in the
-           documentation that you can later link to using the \l {l}{\\l}
-           and \l {sa}{\\sa} commands.}
+        Parentheses allow us to group elements together so that
+        we can quantify and capture them.
 
-           Keywords must be unique within the entire set of
-           documentation processed in on QDoc run.  The command
-           considers the rest of the line as part of its argument,
-           make sure to follow the keyword with a line break.
+        ...
+    * /
+    \endcode
 
-           The \\keyword command is similar to \l {target}{\\target},
-           but stronger.  A keyword can be referenced from anywhere
-           using a simple syntax. For example:
+    The target name \e{capturing parentheses} can be linked from
+    within the same document containing the target in two ways:
 
-           \code
-           / *!
-               \class QRegExp
-               \reentrant
-               \brief The QRegExp class provides pattern
-                      matching using regular expressions.
-               \ingroup tools
-               \ingroup misc
-               \ingroup shared
-               \mainclass
+    \list
+      \o \c {\l {capturing parentheses}} (from within the same qdoc comment)
+      \o \c {\l qregexp.html#capturing-parentheses} (from elsewhere in the same document)
+    \endlist
 
-               \keyword regular expression
+    \note The brackets in the link example are required because the
+    target name contains spaces.
 
-               Regular expressions, or "regexps", provide a way to
-               find patterns within text.
+    From other documents, the target name can be linked this way:
 
-               ...
-           * /
-           \endcode
+    \list
+      \o \c {\l http://www.trolltech.com/4.0/doc/html/qregexp.html#capturing-parentheses}
+    \endlist
 
-           can be referenced like this
+    See also \l {l-command} {\\l}, \l {sa-command} {\\sa} and \l
+    {keyword-command} {\\keyword}.
 
-           \code
-           / *!
-               When a string is surrounded by slashes, it's
-               interpreted as a \l regular expression.
-           * /
-           \endcode
+    \target keyword-command
+    \section1 \\keyword 
 
-           which will be rendered as
+    The \\keyword command names a place in the documentation that you
+    can link to using the \l {l-command} {\\l (link)} and \l
+    {sa-command} {\\sa (see also)} commands.
 
-           \quotation
-               When a string is surrounded by slashes, it's
-               interpreted as a \l {regular expression}.
-           \endquotation
+    The \\keyword command is like the \l {target-command} {\\target}
+    command, but stronger. A keyword can be linked from anywhere using
+    a simple syntax.
 
-           If the keyword does't contain any spaces, the brackets can
-           be omitted as well.
+    Keywords must be unique over all the documents processed during
+    the QDoc run. The command uses the rest of the line as its
+    argument. Be sure to follow the keyword with a line break.
 
-           See also \l {l}{\\l}, \l {sa}{\\sa} and \l
-           {target}{\\target}.
-    \endtable
-*/
 
-/*!
-    \page 09-qdoc-commands-graphic.html
-    \previouspage Linking Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Container Commands
+    \code
+    / *!
+        \class QRegExp
+        \reentrant
+        \brief The QRegExp class provides pattern
+               matching using regular expressions.
+        \ingroup tools
+        \ingroup misc
+        \ingroup shared
+        \mainclass
 
-    \title Graphic Commands
+        \keyword regular expression
 
-    The graphic commands makes it possible to include images in the
-    documentation. The images can be rendered as separate paragraphs,
-    or within running text.
+        Regular expressions, or "regexps", provide a way to
+        find patterns within text.
 
-    \section1 Alphabetical List
+        ...
+    * /
+    \endcode
 
-    \l {09-qdoc-commands-graphic.html#caption}{\\caption},
-    \l {09-qdoc-commands-graphic.html#image}{\\image},
-    \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
+    The location marked with the keyword can be linked with:
 
-    \section1 Command Descriptions
+    \code
+    / *!
+        When a string is surrounded by slashes, it is
+        interpreted as a \l {regular expression}.
+    * /
+    \endcode
 
-    \table
-    \header
-        \o Command
-        \o Description
+    QDoc renders this as:
 
-    \row
-        \o \bold \\image \target image
-        \o \bold {The \\image command expands to the image specified by its
-           argument, and renders it centered as a separate paragraph.}
+    \quotation
+        When a string is surrounded by slashes, it's
+        interpreted as a \l {regular expression}.
+    \endquotation
 
-           The \\image command replaces the old \\img command. For more
-           information, see the \l
-           {26-qdoc-commands-compatibility.html#image-versus-img}
-           {compatibility} section.
+    If the keyword text contains spaces, the brackets are required.
 
-           The command takes two arguments. The first is the name of
-           the image file. The second argument is optional and is a
-           simple description of the image equivalent to the HTML
-           alt="" in an image tag. The description is used for
-           tooltips, and when a browser doesn't support images like
-           the Lynx text browser.
+    See also \l {l-command} {\\l (link)}, \l {sa-command} {\\sa (see
+    also)} and \l {target-command} {\\target}.
 
-           The command considers the rest of the line after the file
-           name its second argument, make sure that you follow the
-           filename or description with a line break. Braces are only
-           necessary if the description spans several lines.
+*/
 
-           For example:
+/*!
+    \page 09-qdoc-commands-includingimages.html
+    \previouspage Creating Links
+    \contentspage Table of Contents
+    \nextpage Tables and Lists
 
-           \code
-           / *!
-               Qt by Trolltech is a C++ toolkit for cross-platform GUI
-               application development.
+    \title Including Images
 
-               \image happyguy.jpg "Happy guy"
+    The graphic commands makes it possible to include images in the
+    documentation. The images can be rendered as separate paragraphs,
+    or within running text.
 
-               Qt provides single-source portability across Microsoft
-               Windows, Mac OS X, Linux, and all major commercial Unix
-               variants. It is also available for embedded devices.
-           * /
-           \endcode
+    \target image-command
+    \section1 \\image 
 
-           will be rendered as
+    The \\image command expands to the image specified by its first
+    argument, and renders it centered as a separate paragraph.
 
-           \quotation
-               Qt by Trolltech is a C++ toolkit for cross-platform GUI
-               application development.
+    The \\image command replaces the old \\img command. For more
+    information, see the \l
+    {26-qdoc-commands-compatibility.html#image-versus-img}
+    {compatibility} section.
 
-               \image happyguy.jpg image "Happy guy"
+    The command takes two arguments. The first argument is the name of
+    the image file. The second argument is optional and is a simple
+    description of the image, equivalent to the HTML alt="" in an image
+    tag. The description is used for tooltips, and for when a browser
+    doesn't support images, like the Lynx text browser.
 
-               Qt provides single-source portability across Microsoft
-               Windows, Mac OS X, Linux, and all major commercial Unix
-               variants. It is also available for embedded devices.
-           \endquotation
+    The remaining text \e{after} the file name is the optional,
+    description argument. Be sure to follow the file name or the
+    description with a line break. Curly brackets are required if the
+    description argument spans multiple lines.
 
-           See also \l {inlineimage}{\\inlineimage} and \l
-           {caption}{\\caption}.
+    \code
+    / *!
+        Qt by Trolltech is a C++ toolkit for cross-platform GUI
+        application development.
 
-    \row
-        \o \bold \\inlineimage \target inlineimage
-        \o \bold {The \\inlineimage command expands to the image
-           specified by its argument; the image is rendered inline
-           with the rest of the text.}
+        \image happyguy.jpg "Happy guy"
 
-           The command takes two arguments. The first is the name of
-           the image file. The second argument is optional and is a
-           simple description of the image equivalent to the HTML
-           alt="" in an image tag. The description is used for
-           tooltips, and when a browser doesn't support images like
-           the Lynx text browser.
+        Qt provides single-source portability across Microsoft
+        Windows, Mac OS X, Linux, and all major commercial Unix
+        variants. It is also available for embedded devices.
+    * /
+    \endcode
 
-           The most common use of the \\inlineimage command is in
-           lists and tables. For example:
+    QDoc renders this as:
 
-           \code
-           / *!
-               \list 1
-               \o \inlineimage happy.gif Oh so happy!
-               \o \inlineimage happy.gif Oh so happy!
-               \o \inlineimage happy.gif Oh so happy!
-               \endlist
-           * /
-           \endcode
+    \quotation
+        Qt by Trolltech is a C++ toolkit for cross-platform GUI
+        application development.
 
-           will be rendered as
+        \image happyguy.jpg image "Happy guy"
 
-           \list 1
-           \o \inlineimage happy.gif Oh so happy!
-           \o \inlineimage happy.gif Oh so happy!
-           \o \inlineimage happy.gif Oh so happy!
-           \endlist
+        Qt provides single-source portability across Microsoft
+        Windows, Mac OS X, Linux, and all major commercial Unix
+        variants. It is also available for embedded devices.
+        \endquotation
 
-           And
+    See also \l {inlineimage-command} {\\inlineimage} and \l
+    {caption-command} {\\caption}.
 
-           \code
-           / *!
-               \table
-               \header
-                   \o Trolltech
-                   \o Trolltech
-               \row
-                   \o \inlineimage happy.gif Oh so happy!
-                   \o \inlineimage happy.gif Oh so happy!
-               \row
-                   \o \inlineimage happy.gif Oh so happy!
-                   \o \inlineimage happy.gif Oh so happy!
-               \endtable
-           * /
-           \endcode
+    \target inlineimage-command
+    \section1 \\inlineimage 
 
-           will be rendered as
+    The \\inlineimage command expands to the image specified by its
+    argument. The image is rendered inline with the rest of the text.
 
-           \raw HTML
-               <table align="center" cellpadding="2"
-                   cellspacing="1" border="0">
-               <tr valign="top" bgcolor="#a2c511">
-                   <th>Trolltech</th>
-                   <th>Trolltech</th>
-               </tr>
+    The command takes two arguments. The first argument is the name of
+    the image file. The second argument is optional and is a simple
+    description of the image, equivalent to the HTML alt="" in an image
+    tag. The description is used for tooltips, and for when a browser
+    doesn't support images, like the Lynx text browser.
 
-               <tr valign="top" bgcolor="#f0f0f0">
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-               </tr>
+    The most common use of the \\inlineimage command is in lists and
+    tables. Here is an example of including inline images in a list:
 
-               <tr valign="top" bgcolor="#f0f0f0">
-                   <td><img src="images/happy.gif" alt="Oh so happy!"/>
-                   </td>
-                   <td><img src="images/happy.gif" alt="Oh so happy!" />
-                   </td>
-               </tr>
+    \code
+    / *!
+        \list 1
+          \o \inlineimage happy.gif Oh so happy!
+          \o \inlineimage happy.gif Oh so happy!
+          \o \inlineimage happy.gif Oh so happy!
+        \endlist
+    * /
+    \endcode
 
-               </table>
-           \endraw
+    QDoc renders this as:
 
-           The command can also be used to insert an image
-           inline with the regular text. For example:
+    \list 1
+      \o \inlineimage happy.gif Oh so happy!
+      \o \inlineimage happy.gif Oh so happy!
+      \o \inlineimage happy.gif Oh so happy!
+    \endlist
 
-           \code
-           / *!
-               \inlineimage training.jpg Training by Trolltech
-               The Qt Programming course is offered as a
-               five day Open Enrollment Course. The classes
-               are open to the public.While the course is open
-               to anyone who wants to learn, attendees should
-               have significant experience in C++ development
-               to derive maximum benefit from the course.
-           * /
-           \endcode
+    Her eis an example of including inline images in a table:
 
-           will be rendered as
+    \code
+    / *!
+        \table
+        \header
+            \o Trolltech
+            \o Trolltech
+        \row
+            \o \inlineimage happy.gif Oh so happy!
+            \o \inlineimage happy.gif Oh so happy!
+        \row
+            \o \inlineimage happy.gif Oh so happy!
+            \o \inlineimage happy.gif Oh so happy!
+        \endtable
+    * /
+    \endcode
 
-           \quotation
-               \inlineimage training.jpg Training by Trolltech
-               The Qt Programming course is offered as a
-               five day Open Enrollment Course. The classes
-               are open to the public.While the course is open
-               to anyone who wants to learn, attendees should
-               have significant experience in C++ development
-               to derive maximum benefit from the course.
-           \endquotation
+    QDoc renders this as:
 
-           See also \l {image}{\\image} and \l {caption}{\\caption}.
+    \raw HTML
+        <table align="center" cellpadding="2"
+            cellspacing="1" border="0">
+        <tr valign="top" bgcolor="#a2c511">
+            <th>Trolltech</th>
+            <th>Trolltech</th>
+        </tr>
+        <tr valign="top" bgcolor="#f0f0f0">
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+        </tr>
+        <tr valign="top" bgcolor="#f0f0f0">
+            <td><img src="images/happy.gif" alt="Oh so happy!"/>
+            </td>
+            <td><img src="images/happy.gif" alt="Oh so happy!" />
+            </td>
+        </tr>
+        </table>
+    \endraw
 
-    \row
-        \o \bold \\caption \target caption
-        \o \bold {The \\caption command provides a caption for an image.}
+    The command can also be used to insert an image inline with the
+    text.
 
-           The command follows the same conventions for parentheses and use
-           of braces for its \l argument as the \l {i}{\\i} command.
+    \code
+    / *!
+        \inlineimage training.jpg Training by Trolltech
+        The Qt Programming course is offered as a
+        five day Open Enrollment Course. The classes
+        are open to the public.While the course is open
+        to anyone who wants to learn, attendees should
+        have significant experience in C++ development
+        to derive maximum benefit from the course.
+    * /
+    \endcode
 
-           \warning This is preliminary functionality. The
-           command is not fully implemented.
+    QDoc renders this as:
 
-           See also \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage}
+    \quotation
+       \inlineimage training.jpg Training by Trolltech
+        The Qt Programming course is offered as a
+        five day Open Enrollment Course. The classes
+        are open to the public.While the course is open
+        to anyone who wants to learn, attendees should
+        have significant experience in C++ development
+        to derive maximum benefit from the course.
+    \endquotation
 
-    \endtable
-*/
+    See also \l {image-command} {\\image} and \l {caption-command} {\\caption}.
 
-/*!
-    \page 10-qdoc-commands-container.html
-    \previouspage Graphic Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Document Contents Commands
+    \target caption-command
+    \section1 \\caption 
 
-    \title Container Commands
+    The \\caption command provides a caption for an image.
 
-    The container commands create tables and lists with associated
-    items and contents. A list is rendered left aligned as a separate
-    paragraph. A table is rendered centered as a separate paragraph,
-    and its width depends on its content.
+    The command takes all the text up to the end of the paragraph to
+    be the caption. Experiment until you get the effect you want.
 
-   \section1 Alphabetical List
+    \code
+    / *!
+      \table 100%
+        \row
+          \o \image windowsvista-pushbutton.png 
+             \caption The QPushButton widget provides a command button.
+          \o \image windowsvista-toolbutton.png
+             \caption The QToolButton class provides a quick-access button to commands
+             or options, usually used inside a QToolBar.
+       \endtable
+    * /
+    \endcode
 
-    \l {10-qdoc-commands-container.html#header}{\\header},
-    \l {10-qdoc-commands-container.html#list}{\\list},
-    \l {10-qdoc-commands-container.html#o}{\\o},
-    \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue},
-    \l {10-qdoc-commands-container.html#row}{\\row},
-    \l {10-qdoc-commands-container.html#table}{\\table},
-    \l {10-qdoc-commands-container.html#value}{\\value}
+    QDoc renders this as:
 
-    \section1 Command Descriptions
+    \table 100%
+      \row
+        \o \image windowsvista-pushbutton.png 
+           \caption The QPushButton widget provides a command button.
+        \o \image windowsvista-toolbutton.png
+           \caption The QToolButton class provides a quick-access button to commands
+           or options, usually used inside a QToolBar.
+    \endtable
 
-    \table
-    \header
-        \o Command
-        \o Description
+    See also \l {image-command} {\\image} and \l {inlineimage-command}
+    {\\inlineimage} 
+*/
 
-    \row
-        \o \bold \\table \target table
-        \o \bold {The \\table command and the corresponding \\endtable
-           command delimit the contents of a table.}
+/*!
+    \page 10-qdoc-commands-tablesandlists.html
+    \previouspage Including Images
+    \contentspage Table of Contents
+    \nextpage Special Content
+
+    \title Tables and Lists
 
-           The command accepts a single argument specifying the
-           table's width in percentage:
+    These commands enable creating lists and tables. A list is
+    rendered left aligned as a separate paragraph. A table is rendered
+    centered as a separate paragraph. The table width depends on the
+    width of its contents.
+
+    \target table-command
+    \section1 \\table 
+
+    The \\table and \\endtable commands delimit the contents of a
+    table.
+
+    The command accepts a single argument specifying the table's width
+    as a percentage of the page width:
 
            \code
            / *!
@@ -2424,15 +2566,15 @@
            * /
            \endcode
 
-           The code above ensures that the table will fill all
-           available space. If the table's width is smaller than 100 %,
-           the table will be centered in the generated documentation.
+    The code above ensures that the table will fill all available
+    space. If the table's width is smaller than 100 %, the table will
+    be centered in the generated documentation.
 
-           A table can contain headers, rows and columns. A row starts
-           with a \l {row}{\\row} command and consists of cells, which
-           starts with a \l {o}{\\o} command. There is also a \l
-           {header}{\\header} command which is a special kind of row
-           with a special formatting. For example:
+    A table can contain headers, rows and columns. A row starts with a
+    \l {row-command} {\\row} command and consists of cells, which
+    starts with a \l {o-command} {\\o} command. There is also a \l
+    {header-command} {\\header} command which is a special kind of row
+    with a special formatting.
 
            \code
            / *!
@@ -2458,7 +2600,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2498,8 +2640,8 @@
                </table>
            \endraw
 
-           You can also make cells span several rows and columns. For
-           example:
+    You can also make cells span several rows and columns. For
+    example:
 
            \code
            / *!
@@ -2519,7 +2661,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2" cellspacing="1"
@@ -2548,20 +2690,20 @@
                </table>
            \endraw
 
-           See also \l {header}{\\header}, \l {row}{\\row} and \l {o}{\\o}.
+    See also \l {header-command} {\\header}, \l {row-command} {\\row} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\header \target header
-        \o \bold {The \\header command indicates that the following
-           table cells are the current table's column headers.}
+    \target header-command
+    \section1 \\header 
 
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} commands. A header can contain
-           several cells. A cell is created with the \l {o}{\\o}
-           command.
+    The \\header command indicates that the following table cells are
+    the current table's column headers.
 
-           A header cell's text is centered within the table cell and
-           rendered using a bold font. For example:
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} commands. A header can contain several
+    cells. A cell is created with the \l {o-command} {\\o} command.
+
+    A header cell's text is centered within the table cell and
+    rendered using a bold font.
 
            \code
            / *!
@@ -2577,7 +2719,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2598,23 +2740,22 @@
                </table>
            \endraw
 
-           See also \l {table}{\\table}, \l {row}{\\row} and \l {o}{\\o}.
+    See also \l {table-command} {\\table}, \l {row-command} {\\row} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\row \target row
-        \o \bold {The \\row command indicates that the following table
-           cells belong to the same row in the current table.}
+    \target row-command
+    \section1 \\row 
 
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} commands. A row can contain
-           several cells. A cell is created with the \l {o}{\\o}
-           command.
+    The \\row command begins a new row in a table. The \l {o-command}
+    {\\o items} that belong in the new row will immediately follow the
+    \\row.
 
-           The background cell color of each row alternate between two
-           shades of grey, making it easier to distinguish the rows
-           from each other. The cells' contents is left aligned.
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} commands. A row can contain several
+    cells. A cell is created with the \l {o-command} {\\o} command.
 
-           For example:
+    The background cell color of each row alternates between two
+    shades of grey, making it easier to distinguish the rows from each
+    other. The cells' contents is left aligned.
 
            \code
            / *!
@@ -2640,7 +2781,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2"
@@ -2680,44 +2821,45 @@
                </table>
            \endraw
 
-           See also \l {table}{\\table}, \l {header}{\\header} and \l
-           {o}{\\o}.
+    See also \l {table-command} {\\table}, \l {header-command}
+    {\\header} and \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\value \target value
-        \o \bold {The \\value command starts the documentation of a C++ enum
-           item}.
+    \target value-command
+    \section1 \\value 
 
-           The command's first argument is the enum item. Then follows
-           its associated description. The description argument ends
-           at the next blank line or \\value. The arguments are
-           rendered within a table.
+    The \\value command starts the documentation of a C++ enum item.
 
-           The documentation will be located in the associated class,
-           header file or namespace documentation. See the \l
-           {enum}{\\enum} documentation for an example.
+    The command's first argument is the enum item. Then follows its
+    associated description. The description argument ends at the next
+    blank line or \\value. The arguments are rendered within a table.
 
-           See also \l {enum}{\\enum} and \l {omitvalue}{\\omitvalue}.
+    The documentation will be located in the associated class, header
+    file or namespace documentation. See the \l {enum-command}
+    {\\enum} documentation for an example.
 
-    \row
-        \o \bold \\omitvalue \target omitvalue
-        \o \bold {The \\omitvalue command excludes a C++ enum item
-           from the documentation}.
+    See also \l {enum-command} {\\enum} and \l {omitvalue-command} {\\omitvalue}.
 
-           The command's only argument is the name of the enum item
-           that will be omitted. See the \l {enum}{\\enum}
-           documentation for an example.
+    \target omitvalue-command
+    \section1 \\omitvalue 
 
-           See also \l {enum}{\\enum} and \l {value}{\\value}.
+    The \\omitvalue command excludes a C++ enum item from the
+    documentation.
 
-    \row
-        \o \bold \\list \target list
-        \o \bold {The \\list command and the corresponding \\endlist
-           command delimit a list of items.}
+    The command's only argument is the name of the enum item that will
+    be omitted. See the \l {enum-command} {\\enum} documentation for
+    an example.
+
+    See also \l {enum-command} {\\enum} and \l {value-command}
+    {\\value}.
+
+    \target list-command
+    \section1 \\list 
 
-           You need to create each list item explicitly using the \l
-           {o}{\\o} command. A list can contain one or more items; it
-           can also be nested. For example:
+    The \\list and \\endlist commands delimit a list of items.
+
+    Create each list item with the \l {o-command} {\\o} command. A
+    list always contains one or more items. Lists can be nested. For
+    example:
 
            \code
            / *!
@@ -2738,7 +2880,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \list
            \o Qt Reference Documentation: Getting Started
@@ -2755,8 +2897,8 @@
                \endlist
            \endlist
 
-           The \\list command takes an optional argument providing
-           alternative appearances for the list items. For example:
+    The \\list command takes an optional argument providing
+    alternative appearances for the list items.
 
            \code
            / *!
@@ -2768,7 +2910,7 @@
            * /
            \endcode
 
-           will render the list items with bullets (the default):
+     QDoc renders the list items with bullets (the default):
 
            \list
                \o How to Learn Qt
@@ -2776,9 +2918,12 @@
                \o Tutorial and Examples
            \endlist
 
-           If you provide 'A' as an argument to the \\list command,
-           the bullets are replaced with characters following in
-           alphabetical order:
+    \warning There appears to be a bug in qdoc3 here. If you include
+    any of the argument types, you get a numeric list. We're looking
+    into it.
+
+    If you provide 'A' as an argument to the \\list command, the
+    bullets are replaced with characters in alphabetical order:
 
            \list A
                \o How to Learn Qt
@@ -2786,8 +2931,8 @@
                \o Tutorial and Examples
            \endlist
 
-           If you replace 'A' with '1', the list items are rendered
-           with numbers following in ascending order:
+     If you replace 'A' with '1', the list items are numbered in
+     ascending order:
 
            \list 1
                \o How to Learn Qt
@@ -2796,8 +2941,8 @@
 
            \endlist
 
-           If you provide 'i' as the argument, the default bullets are
-           replaced with roman numerals:
+    If you provide 'i' as the argument, the bullets are replaced with
+    roman numerals:
 
            \list i
                \o How to Learn Qt
@@ -2805,9 +2950,9 @@
                \o Tutorial and Examples
            \endlist
 
-           Or finally, you can make the list items appear with roman
-           numbers following in ascending order if you provide 'I' as
-           the optional argument:
+    Finally, you can make the list items appear with roman numbers
+    following in ascending order if you provide 'I' as the optional
+    argument:
 
            \list I
                \o How to Learn Qt
@@ -2815,9 +2960,9 @@
                \o Tutorial and Examples
            \endlist
 
-           You can also make the listing start at any character or
-           number by simply provide the number or character you want
-           to start at. For example:
+    You can also make the listing start at any character or number by
+    simply provide the number or character you want to start at. For
+    example:
 
            \code
            / *!
@@ -2829,7 +2974,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \list G
                \o How to Learn Qt
@@ -2837,30 +2982,30 @@
                \o Tutorial and Examples
            \endlist
 
-           See also \l {o}{\\o}.
+    See also \l {o-command} {\\o}.
 
-    \row
-        \o \bold \\o \target o
-        \o \bold {The \\o command announce a table or list item.}
+    \target o-command
+    \section1 \\o (cell, item)
+
+    The \\o command announce a table or list item.
 
-           Earlier we used the \l {i}{\\i} command for this purpose. For more
-           information see the \l
-           {26-qdoc-commands-compatibility.html#o-versus-i}{compatibility}
-           section.
+    Earlier we used the \l {i-command} {\\i} command for this
+    purpose. For more information see the \l
+    {26-qdoc-commands-compatibility.html#o-versus-i} {compatibility}
+    section.
 
-           The command can only be used within the \l{table}
-           {\\table...\\endtable} or \l{list}{\\list... \\endlist}
-           commands.
+    The command can only be used within the \l{table-command}
+    {\\table...\\endtable} or \l{list-command} {\\list... \\endlist}
+    commands.
 
-           It considers everything until the next occurrence
-           of the \\o command, or the currently applicable \l
-           {table}{\\endtable} or \l {list}{\\endlist} command, as its
-           argument. For examples, see \l {table}{\\table} and \l
-           {list}{\\list}.
+    It considers everything until the next occurrence of the \\o
+    command, or the currently applicable \l {table-command}
+    {\\endtable} or \l {list-command} {\\endlist} command, as its
+    argument. For examples, see \l {table-command} {\\table} and \l
+    {list-command} {\\list}.
 
-           If the command is used within a table, you can in addition
-           specify how many rows or columns the item should span. For
-           example:
+    If the command is used within a table, you can in addition specify
+    how many rows or columns the item should span.
 
            \code
            / *!
@@ -2880,7 +3025,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \raw HTML
                <table align="center" cellpadding="2" cellspacing="1"
@@ -2909,333 +3054,133 @@
                </table>
            \endraw
 
-           If not specified, the item will span one column and one row.
+    If not specified, the item will span one column and one row.
+
+    See also \l {table-command} {\\table}, \l {header-command}
+    {\\header}, \l {list-command} {\\list} and \l {o-command} {\\o}.
 
-           See also \l {table}{\\table}, \l {header}{\\header},
-           \l {list}{\\list} and \l {o}{\\o}.
-    \endtable
 */
 
 /*!
-    \page 11-qdoc-commands-documentcontents.html
-    \previouspage Container Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Miscellaneous Commands
+    \page 11-qdoc-commands-specialcontent.html
+    \previouspage Tables and Lists
+    \contentspage Table of Contents
+    \nextpage Miscellaneous
 
-    \title Document Contents Commands
+    \title Special Content
 
     The document contents commands identify parts of the documentation,
     i.e. parts with a special rendering, conceptual meaning or
     function.
 
-    \section1 Alphabetical List
-
-    \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract},
-    \l {11-qdoc-commands-documentcontents.html#brief}{\\brief},
-    \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote},
-    \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese},
-    \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-       {\\tableofcontents},
-    \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation},
-    \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
-
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\abstract \target abstract
-        \o \bold {The \\abstract command and the corresponding \\endabstract
-           command delimit a document's abstract section.}
-
-           The abstract section is rendered as an indented italicized
-           paragraph.
+    \target abstract-command
+    \section1 \\abstract 
 
-           \warning This is preliminary funcionality. The
-           command is not fully implemented. Currently, the abstract
-           section is rendered as a regular HTML paragraph. For
-           example:
+    The \\abstract and \\endabstract commands delimit a
+    document's abstract section.
 
-           \code
-           / *!
-               \abstract
-                   Qt by Trolltech is a C++ toolkit for cross-platform
-                   GUI application development. Qt provides
-                   single-source portability across Microsoft Windows,
-                   Mac OS X, Linux, and all major commercial Unix
-                   variants. It is also available for embedded
-                   devices.
-               \endabstract
-           * /
-           \endcode
+    The abstract section is rendered as an indented italicized
+    paragraph.
 
-           will be rendered as
-
-           \abstract
-              Qt by Trolltech is a C++ toolkit for cross-platform GUI
-              application development. Qt provides single-source
-              portability across Microsoft Windows, Mac OS X, Linux,
-              and all major commercial Unix variants. It is also
-              available for embedded devices.
-           \endabstract
-
-    \row
-        \o \bold \\quotation \target quotation
-        \o \bold { The \\quotation command and the corresponding
-           \\endquotation command delimit a quotation remark.}
-
-           This command replaces the old \\quote command. For more
-           information see the \l
-           {26-qdoc-commands-compatibility.html#quotation-versus-quote}
-           {compatibility} section.
-
-           The remark is rendered as a separate centered
-           paragraph. For example:
-
-           \code
-           / *!
-               While the prospect of a significantly broader market is
-               good news for Firstlogic, the notion also posed some
-               challenges. Dave Dobson, director of technology for the La
-               Crosse, Wisconsin-based company, said:
-
-
-               \quotation
-                   As our solutions were being adopted into new
-                   environments, we saw an escalating need for easier
-                   integration with a wider range of enterprise
-                   applications.
-               \endquotation
-           * /
-           \endcode
-
-           will be rendered as
-
-           While the prospect of a significantly broader market is
-           good news for Firstlogic, the notion also posed some
-           challenges. Dave Dobson, director of technology for the La
-           Crosse, Wisconsin-based company, said:
-
-           \quotation
-               As our solutions were being adopted into new
-               environments, we saw an escalating need for easier
-               integration with a wider range of enterprise
-               applications.
-           \endquotation
-
-    \row
-        \o \bold \\footnote \target footnote
-        \o \bold {The \\footnote command and the corresponding
-           \\endfootnote command delimit a footnote.}
-
-           The footnote follows the standard conventions, rendered at the
-           bottom of the page.
-
-           \warning This is preliminary funcionality. The
-           command is not fully implemented.
-
-           For example:
-
-           \code
-           / *!
-               In Qt 4 we have tried to simplify the constructors of
-               QObject/QWidget subclasses. This makes subclassing
-               easier, at the same time as it helps make the Qt
-               library more efficient.
-
-               \footnote
-               Constructors no longer take a "const char *name"
-               parameter. If you want to specify a name for a QObject,
-               you must call QObject::setObjectName() after
-               construction. The object name is now a QString.
-               \endfootnote
-
-               QWidget's WFlags data type has been split in two:
-               Qt::WindowFlags specifies low-level window flags (the
-               type of window and the frame style), whereas
-               Qt::WidgetAttribute specifies various higher-level
-               attributes about the widget (e.g.,
-               WA_StaticContents).
-           * /
-           \endcode
-
-           will be rendered as
-
-           \quotation
-               In Qt 4 we have tried to simplify the constructors of
-               QObject/QWidget subclasses. This makes subclassing
-               easier, at the same time as it helps make the Qt
-               library more efficient.
-
-               \footnote
-               Constructors no longer take a "const char *name"
-               parameter. If you want to specify a name for a QObject,
-               you must call QObject::setObjectName() after
-               construction. The object name is now a QString.
-               \endfootnote
-
-               QWidget's WFlags data type has been split in two:
-               Qt::WindowFlags specifies low-level window flags (the
-               type of window and the frame style), whereas
-               Qt::WidgetAttribute specifies various higher-level
-               attributes about the widget (e.g.,
-               WA_StaticContents).
-           \endquotation
-
-    \row
-        \o \bold \\tableofcontents \target tableofcontents
-        \o \bold {The \\tableofcontents command generates a
-           table displaying the titles of the current documentation
-           unit's parts, chapters, sections, etc.}
-
-           The command accepts a single optional argument:
-
-           \code
-               \tableofcontents sectionN
-           \endcode
-
-           where \c sectionN is the deepest section to include (by
-           default all sections are included).
-
-           For example, it the documentation unit's structure looks
-           something like this:
-
-           \quotation
-           \raw HTML
-               <a name="Basic Qt">
-               <h1>Basic Qt</h1>
-               </a>
-               <p>This is the first part.</p>
-
-                   <a name="Getting started">
-                   <h2>Getting Started</h2>
-                   </a>
-                   This is the first part's first chapter.</p>
-
-                       <a name="Hello Qt">
-                       <h3>Hello Qt</h3>
-                       </a>
-                       <p>This is the first chapter's first section.</p>
-
-                       <a name="Making Connections">
-                       <h3>Making Connections</h3>
-                       </a>
-                       <p>This is the first chapter's second section.</p>
+    \warning The \bold{\\abstract} and \bold{\\endabstract} commands
+    have not been implemented. The abstract section is rendered as a
+    regular HTML paragraph.
 
-                       <a name="Using the Reference Documentation">
-                       <h3>Using the Reference Documentation</h3>
-                       </a>
-                       <p>This is the first chapter's third section.</p>
+    \target quotation-command
+    \section1 \\quotation 
 
-                   <a name="Creating Dialogs">
-                   <h2>Creating Dialogs</h2>
-                   </a>
-                   <p>This is the first part's second chapter.</p>
+    The \\quotation and \\endquotation commands delimit a long quotation.
 
-                       <a name="Subclassing QDialog">
-                       <h3>Subclassing QDialog</h3>
-                       </a>
-                       <p>This is the second chapter's first section.</p>
+    The text in the delimited block is surrounded by
+    \bold{<blockquote>} and \bold{</blockquote>} in the html output,
+    e.g.:
 
-                       ...
+        \code
+        / *!
+          While the prospect of a significantly broader market is
+          good news for Firstlogic, the notion also posed some
+          challenges. Dave Dobson, director of technology for the La
+          Crosse, Wisconsin-based company, said:
+
+          \quotation
+             As our solutions were being adopted into new
+             environments, we saw an escalating need for easier
+             integration with a wider range of enterprise
+             applications.
+          \endquotation
+        * /
+        \endcode
 
-               <a name="Intermediate Qt">
-               <h1>Intermediate Qt</h1>
-               </a>
-               <p>This is the second part.</p>
+    The text in the \bold{\\quotation} block will appear in the generated HTML as:
 
-                   <a name="Layout Management">
-                   <h2>Layout Management</h2>
-                   </a>
-                   <p>This is the second part's first chapter.</p>
+	\code
+	<blockquote>
+	  <p>As our solutions were being adopted into new environments, 
+	  we saw an escalating need for easier integration with a wider 
+	  range of enterprise applications.</p> 
+        </blockquote> 
+	\endcode
 
-                       <a name="Basic Layouts">
-                       <h3>Basic Layouts</h3>
-                       </a>
-                       <p>This is the first chapter's first section.</p>
+    The built-in style sheet for most browsers will render the
+    contents of the <blockquote> tag with left and right
+    indentations. The example above would be rendered as:
 
-               ...
+          \quotation
+             As our solutions were being adopted into new
+             environments, we saw an escalating need for easier
+             integration with a wider range of enterprise
+             applications.
+          \endquotation
 
-           \endraw
-           \endquotation
+    But you can redefine the \bold{<blockquote>} tag in your style.css file.
 
-           Then
+    This command replaces the old \\quote command. For more
+    information see the \l
+    {26-qdoc-commands-compatibility.html#quotation-versus-quote}
+    {compatibility} section.
 
-           \code
-           / *!
-               Contents:
+    \target footnote-command
+    \section1 \\footnote 
 
-               \tableofcontents
+    The \\footnote and \\endfootnote commands delimit a footnote.
 
-               ...
-           * /
-           \endcode
+    The footnote is rendered at the bottom of the page.
 
-           will expand to
+    \warning The \bold{\\footnote} and \bold{\\endfootnote} commands
+    have not been implemented. The footnote is rendered as a regular
+    HTML paragraph.
 
-           \quotation
-           \raw HTML
-               <p>Contents:</p>
+    \target tableofcontents-command
+    \section1 \\tableofcontents 
 
-               <ul>
-               <li><a href="#Basic Qt">Basic Qt</a></li>
-                   <ul>
-                   <li><a href="#Getting Started">Getting Started</a></li>
-                       <ul>
-                       <li><a href="#Hello Qt">Hello Qt</a></li>
-                       <li><a href="#Making Connections">
-                           Making Connections</a></li>
-                       <li><a href="#Using the Reference Documentation">
-                           Using the Reference Documentation</a></li>
-                       </ul>
-                   <li><a href="#Creating Dialogs">Creating Dialogs</a></li>
-                       <ul>
-                       <li><a href="#Subclassing QDialog">
-                           Subclassing QDialog</a></li>
-                       </ul>
-                   </ul>
-               <li><a href="#Intermediate Qt">Intermediate Qt</a></li>
-                   <ul>
-                   <li><a href="#Layout Management">Layout Management</a></li>
-                       <ul>
-                       <li><a href="#Basic Layouts">Basic Layouts</a></li>
-                       </ul>
-                   </ul>
-               </ul>
+    The \\tableofcontents command has been disabled because QDoc 
+    now generates a table of contents automatically.
 
-               ...
-           \endraw
-           \endquotation
+    The automatically generated table of contents appears in the upper
+    righthand corner of the page.
 
-           Each table entry becomes a link to the corresponding part,
-           chapter or section.
+    \target brief-command
+    \section1 \\brief 
 
-    \row
-        \o \bold \\brief \target brief
-        \o \bold {The \\brief command introduces a one-sentence
-           description of a class, namespace, header file, property
-           or variable.}
+    The \\brief command introduces a one-sentence description of a
+    class, namespace, header file, property or variable.
 
-           The brief text is used to introduce the documentation of
-           the associated object, and in lists generated using the \l
-           {generatelist}{\\generatelist} command.
+    The brief text is used to introduce the documentation of the
+    associated object, and in lists generated using the \l
+    {generatelist-command} {\\generatelist} command.
 
-           The \\brief command can be used in two significant
-           different ways: \l {brief class}{One for classes,
-           namespaces and header files}, and \l {brief property}{one
-           for properties and variables}.
+    The \\brief command can be used in two significant different ways:
+    \l {brief class} {One for classes, namespaces and header files},
+    and \l {brief-property} {one for properties and variables}.
 
-           \target brief property
+    \target brief-property
 
-           When the \\brief command is used to describe a property or
-           a variable, the brief text must only be a sentence fragment
-           and start with "whether" (for boolean properties and
-           variables) or "the" (for any other property or variable).
+    When the \\brief command is used to describe a property or a
+    variable, the brief text must be a sentence fragment starting with
+    "whether" (for a boolean property or variable) or starting with
+    "the" (for any other property or variable).
 
-           For example the boolean QWidget::isWindow property:
+    For example the boolean QWidget::isWindow property:
 
            \code
            / *!
@@ -3270,7 +3215,7 @@
            * /
            \endcode
 
-           The latter will be rendered as
+    QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -3292,28 +3237,21 @@
                \endlist
 
                See also \l
-               {QWidget::frameGeometry()}{frameGeometry()}, \l
-               {QWidget::rect()}{rect()}, ...
+               {QWidget::frameGeometry()} {frameGeometry()}, \l
+               {QWidget::rect()} {rect()}, ...
            \endquotation
 
-           \target brief class
+    \target brief class
 
-           When the \\brief command is used to describe a class, the
-           brief text should be a complete sentence and must start
-           like this:
+    When the \\brief command is used to describe a class, the brief
+    text should be a complete sentence and must start like this:
 
            \code
            The <classname> class is|provides|contains|specifies...
            \endcode
 
-           and likewise when the command is used for namespaces or
-           header files.
-
-           \warning The brief statement is used as the first
-           paragraph of the detailed description. Do not repeat the
-           sentence.
-
-           For example:
+    \warning The brief statement is used as the first paragraph of the
+    detailed description. Do not repeat the sentence.
 
            \code
            / *!
@@ -3333,7 +3271,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                \raw HTML
@@ -3342,7 +3280,7 @@
 
                The PreviewWindow class is a custom widget displaying
                the names of its currently set window flags in a
-               read-only text editor. \l {preview window}{More...}
+               read-only text editor. \l {preview window} {More...}
 
                \raw HTML
                    <h3>Properties</h3>
@@ -3358,8 +3296,8 @@
                \endraw
 
                \list
-                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
-                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
+                   \o \l {constructor} {PreviewWindow}(QWidget *parent = 0)
+                   \o void \l {function} {setWindowFlags}(Qt::WindowFlags flags)
                \endlist
 
                \list
@@ -3395,13 +3333,14 @@
                    <hr />
                    <h2>Detailed Description</h2>
                \endraw
+       
                The PreviewWindow class is a custom widget displaying
                the names of its currently set window flags in a
                read-only text editor.
 
                The PreviewWindow class inherits QWidget. The widget
                displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
+               {function} {setWindowFlags()} function. It is also
                provided with a QPushButton that closes the window.
 
                ...
@@ -3418,7 +3357,7 @@
                    <h3>PreviewWindow(QWidget *parent = 0)</h3>
                \endraw
 
-               Constructs a preview window widget with \i parent.
+               Constructs a preview window widget with \e parent.
 
                \target function
                \raw HTML
@@ -3434,7 +3373,7 @@
                the text in the widgets text editor.
            \endquotation
 
-           Using \\brief with a namespace can for example look like this:
+    Using \\brief in a \l{namespace-command}{\\namespace}:
 
            \code
            / *!
@@ -3445,8 +3384,7 @@
            * /
            \endcode
 
-           and finally using \\brief with a header file can look
-           something like this:
+    Using \\brief in a \l{headerfile-command}{\\headerfile}:
 
            \code
            / *!
@@ -3460,107 +3398,83 @@
            * /
            \endcode
 
-           See also \l{property}{\\property}, \l{class}{\\class},
-           \l{namespace}{\\namespace} and  \l{headerfile}{\\headerfile}.
-
-    \row
-        \o \bold \\legalese \target legalese
-        \o \bold {The \\legalese command, and the corresponding \\endlegalese
-           command, delimit a licence agreement.}
-
-           If the \\endlegalese command is omitted, QDoc will still
-           process the \\legalese command but considers the rest of
-           the documentation page as the license agreement.
-
-           Ideally, the license documentation is located where the
-           licensed code is used.
-
-           Later the documentation identified by the \\legalese
-           command can be accumulated into a list using the \l
-           {generatelist}{\\generatelist} command with the \c legalese
-           argument. This is useful to generate an overview of all the
-           licenses associated with the source code.
-
-           For example:
-
-           \code
-           \ * !
-               ...
-
-               On X11, Qt also supports drops via the Motif Drag \&
-               Drop Protocol. The implementation incorporates some
-               code that was originally written by Daniel Dardailler,
-               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
-               Trolltech. Here is the original copyright notice:
-
-               \legalese
-               \code
-
-               Copyright 1996 Daniel Dardailler.
-
-               Permission to use, copy, modify, distribute, and sell
-               this software for any purpose is hereby granted without
-               fee, provided that the above copyright notice appear in
-               all copies and that both that copyright notice and this
-               permission notice appear in supporting documentation,
-               and that the name of Daniel Dardailler not be used in
-               advertising or publicity pertaining to distribution of
-               the software without specific, written prior
-               permission. Daniel Dardailler makes no representations
-               about the suitability of this software for any
-               purpose. It is provided "as is" without express or
-               implied warranty.
-
-               Modifications Copyright 1999 Matt Koss, under the same
-               license as above.
-
-               \ endcode
-               \endlegalese
-           * /
-           \endcode
-
-           will be rendered as
+    See also \l{property-command} {\\property}, \l{class-command}
+    {\\class}, \l{namespace-command} {\\namespace} and
+    \l{headerfile-command} {\\headerfile}.
 
-           \quotation
-               ...
+    \target legalese-command
+    \section1 \\legalese 
 
-               On X11, Qt also supports drops via the Motif Drag \&
-               Drop Protocol. The implementation incorporates some
-               code that was originally written by Daniel Dardailler,
-               and adapted for Qt by Matt Koss \<koss@napri.sk\> and
-               Trolltech. Here is the original copyright notice:
+    The \\legalese and \\endlegalese commands delimit a licence agreement.
 
-               \legalese
-               \code
-
-               Copyright 1996 Daniel Dardailler.
+    In the generated HTML, the delimited text is surrounded by a \bold
+    {<div class="LegaleseLeft">} and \bold {</div>} tags.
 
-               Permission to use, copy, modify, distribute, and sell
-               this software for any purpose is hereby granted without
-               fee, provided that the above copyright notice appear in
-               all copies and that both that copyright notice and this
-               permission notice appear in supporting documentation,
-               and that the name of Daniel Dardailler not be used in
-               advertising or publicity pertaining to distribution of
-               the software without specific, written prior
-               permission. Daniel Dardailler makes no representations
-               about the suitability of this software for any
-               purpose. It is provided "as is" without express or
-               implied warranty.
+    For example, here is a license agreement enclosed in \\legalese
+    and \\endlegalese:
 
-               Modifications Copyright 1999 Matt Koss, under the same
-               license as above.
-
-               \endcode
-               \endlegalese
-           \endquotation
-
-    \row
-        \o \bold \\warning \target warning
-        \o \bold {The \\warning command renders a "Warning:" prefix to
-           the command's argument.}
+        \code
+	/ *!
+	  \legalese
+          Copyright 1996 Daniel Dardailler.
+
+          Permission to use, copy, modify, distribute, and sell this
+          software for any purpose is hereby granted without fee,
+          provided that the above copyright notice appear in all
+          copies and that both that copyright notice and this
+          permission notice appear in supporting documentation, and
+          that the name of Daniel Dardailler not be used in
+          advertising or publicity pertaining to distribution of the
+          software without specific, written prior permission. Daniel
+          Dardailler makes no representations about the suitability of
+          this software for any purpose. It is provided "as is"
+          without express or implied warranty.
+
+	  Modifications Copyright 1999 Matt Koss, under the same
+          license as above.
+          \endlegalese
+        * / 
+        \endcode
 
-           For example:
+        It will appear in the generated HTML as:
+
+       \code
+	 <div class="LegaleseLeft">
+	   <p>Copyright 1996 Daniel Dardailler.</p>
+           <p>Permission to use, copy, modify, distribute, and sell
+           this software for any purpose is hereby granted without fee,
+           provided that the above copyright notice appear in all
+           copies and that both that copyright notice and this
+           permission notice appear in supporting documentation, and
+           that the name of Daniel Dardailler not be used in
+           advertising or publicity pertaining to distribution of the
+           software without specific, written prior permission. Daniel
+           Dardailler makes no representations about the suitability of
+           this software for any purpose. It is provided "as is"
+           without express or implied warranty.</p>
+	  
+	   <p>Modifications Copyright 1999 Matt Koss, under the same
+           license as above.</p>
+	 </div>
+       \endcode
+
+    If the \\endlegalese command is omitted, QDoc will process the
+    \\legalese command but considers the rest of the documentation
+    page as the license agreement.
+
+    Ideally, the license text is located with the licensed code.
+
+   Elsewhere, the documentation identified as \e{\\legalese} command
+   can be accumulated using \l {generatelist-command} {\\generatelist}
+   with \c {legalese-command} as the argument. This is useful for
+   generating an overview of the license agreements associated with
+   the source code.
+
+    \target warning-command
+    \section1 \\warning 
+
+    The \\warning command prepends "Warning:" to the command's
+    argument, in bold font.
 
            \code
            / *!
@@ -3573,7 +3487,7 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                Qt::HANDLE is a platform-specific handle type
@@ -3583,50 +3497,31 @@
 
                \warning Using this type is not portable.
            \endquotation
-    \endtable
+
 */
 
 /*!
     \page 12-0-qdoc-commands-miscellaneous.html
-    \previouspage Document Contents Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Topical Commands
+    \previouspage Special Content
+    \contentspage Table of Contents
+    \nextpage The QDoc Configuration File
 
-    \title Miscellaneous Commands
+    \title Miscellaneous
 
-    These commands provide miscellaneous functions
-    connected to the visual appearance of the documentation, and to the
-    process of generating the documentation.
+    These commands provide miscellaneous functions connected to the
+    visual appearance of the documentation, and to the process of
+    generating the documentation.
 
-    \section1 Alphabetical List
+    \target expire-command
+    \section1 \\expire 
 
-    \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else},
-    \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif},
-    \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire},
-    \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist},
-    \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if},
-    \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include},
-    \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta},
-    \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw},
-    \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\unicode}
+    The \\expire command allows you to define an expiration
+    date for your documentation.
 
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\expire \target expire
-        \o \bold {The \\expire command allows you to define an expiration
-           date for your documentation.}
-
-           When using the \\expire command, QDoc will emit a warning
-           when the current date is larger than the specified
-           date. The command accepts one argument; the argument's
-           format is yyyy-mm-dd. For example:
+    When using the \\expire command, QDoc will emit a warning when the
+    current date is larger than the specified date. The command
+    accepts one argument; the argument's format is yyyy-mm-dd. For
+    example:
 
            \code
            / *!
@@ -3645,23 +3540,24 @@
            * /
            \endcode
 
-           If you run QDoc on 4 July 2005, it will emit the warning
+    If you run QDoc on 4 July 2005, it will emit the warning
 
            \quotation
                porting.qdoc:6: Documentation expired 185 days ago
            \endquotation
 
-    \row
-        \o \bold \\generatelist \target generatelist
-        \o \bold {The \\generatelist command expands to a list of
-           various documentation or links to documentation.}
 
-           For example in the Qt Reference Documentation:
+    \target generatelist-command
+    \section1 \\generatelist
+
+    The \\generatelist command expands to a list of various
+    documentation or links to documentation. Below is an example from
+    the Qt Reference Documentation:
 
            \code
            / *!
                \page classes.html
-               \title All Qt Classes (main index)
+               \title All Classes
 
                For a shorter list that only includes the most
                frequently used classes, see \l{Qt's Main Classes}. For
@@ -3672,434 +3568,308 @@
            * /
            \endcode
 
-           is used to generate \l {All Qt Classes (main index)}.
-
-           The command accepts the following arguments:
-
-           \target table example
-
-           \list
-           \o \c annotatedclasses
-
-              The \c annotatedclasses argument provides a table
-              containing the names of all the classes, and a
-              description of each class. Each class name is a link to
-              the class's reference documentation.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                  <table align="center" cellpadding="2"
-                      cellspacing="1" border="0">
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdial.html">
-                          QDial</a>
-                      </td>
-                      <td>Rounded range control (like a speedometer
-                          or potentiometer)</td>
-                  </tr>
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdialog.html">
-                          QDialog</a>
-                      </td>
-                      <td>The base class of dialog windows</td>
-                  </tr>
-
-                  <tr valign="top" bgcolor="#d0d0d0">
-                      <td>
-                      <a href="http://qt.nokia.com/doc/4.0/qdir.html">
-                          QDir</a>
-                      </td>
-                      <td>Access to directory structures and their
-                          contents</td>
-                  </tr>
-                  </table>
-                  \endraw
-              \endquotation
-
-              A class is identified within the documentation by the
-              the \l {class}{\\class} command, and the descriptions
-              are based on the argument of the \l {brief}{\\brief}
-              commands in the class documentation.
-
-           \target list example
-
-           \o \c classes
-
-              The \c classes argument provides a complete alphabetical
-              list of the classes. Each class name is a link to the
-              class's reference documentation.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                      <p><table width="100%">
-
-                      <tr>
-                      <td align="right"><b>A&nbsp;</b></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractbutton.html">QAbstractButton</a></td>
+    This generates the \l {All Classes} page. The command accepts the
+    following arguments:
 
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionmanager.html">QAbstractExtensionManager</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemmodel.html">QAbstractItemModel</a></td>
-                      </tr>
-
-                      <tr>
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstracteventdispatcher.html">QAbstractEventDispatcher</a></td>
+    \target table example
+    \section2 \c annotatedclasses
 
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractformbuilder.html">QAbstractFormBuilder</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemview.html">QAbstractItemView</a></td>
-                      </tr>
+    The \c annotatedclasses argument provides a table containing the
+    names of all the classes, and a description of each class. Each
+    class name is a link to the class's reference documentation. For
+    example:
 
-                      <tr>
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractextensionfactory.html">QAbstractExtensionFactory</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractitemdelegate.html">QAbstractItemDelegate</a></td>
-
-                      <td align="right"></td>
-                      <td><a href="http://qt.nokia.com/doc/4.0/qabstractlistmodel.html">QAbstractListModel</a></td>
-                      </tr>
-                      </table></p>
-                  \endraw
-              \endquotation
-
-              A class is identified within the documentation by the
-              the \l {class}{\\class} command.
-
-           \o \c classesbymodule
+    \table
+      \row
+        \o QDial
+	\o Rounded range control (like a speedometer or potentiometer)
+      \row
+        \o QDialog
+	\o The base class of dialog windows
+      \row
+        \o QDir
+        \o Access to directory structures and their contents
+    \endtable
 
-              This particular argument requests an additional argument,
-              i.e. a specification of the module.
+    A C++ class is documented with the \l {class-command} {\\class}
+    command. The annotation for the class is taken from the argument
+    of the class comment's \l {brief-command} {\\brief} command.
 
-              For example:
+    \target list example
+    \section2 \c classes
 
-              \code
-              / *!
-                  \page qtgui.html
-                  \contentspage Qt Classes by Module
-                  \previouspage QtCore Classes
-                  \nextpage QtNetwork Classes
+    The \c classes argument provides a complete alphabetical list of
+    the classes. Each class name is a link to the class's reference
+    documentation. This command is uded to generate the \l
+    {classes.html} {All Classes} page this way:
 
-                  \title QtGui Classes
+    \code
+    / *!
+        \page classes.html
+        \title All Classes
+        \ingroup classlists
 
-                  \keyword QtGui
+        \brief If you know the name of the class you want, find it here.
 
-                  \generatelist {classesbymodule QtGui}
-              * /
-              \endcode
+        This is a list of all Qt classes. For a list of the classes
+        provided for compatibility with Qt3, see \l{Qt3 Support
+        Classes}. For classes that have been deprecated, see the
+        \l{Obsolete Classes} list.
 
-              Together, these arguments provide a table containing the
-              classes considered members of the specified module,
-              accompanied with a brief description. Each class name is
-              a link to the class's reference documentation.
+        \generatelist classes
+    * /
+    \endcode
 
-              The generated table is rendered similarily to the one
-              generated when using the \l {table example}{\c
-              annotatedclasses} argument.
+    A C++ class is documented with the \l {class-command} {\\class}
+    command.
 
-              For the basic classes in Qt, a class's module is
-              determined by its location, i.e. its directory. However,
-              for extensions, like ActiveQt and Qt Designer, a class
-              is related to a module with the \l
-              {inmodule}{\\inmodule} command.
+    \section2 \c classesbymodule
 
-           \o \c classesbyedition
+    When this argument is used, a second argument is required, which
+    specifies the module whose classes are to be listed. QDoc
+    generates a table containing those classes. Each class is listed
+    with the text of its \l{brief-command} {\\brief} command.
 
-              This particular argument requests an additional argument,
-              i.e. a specification of the edition.
+    This command is used to generate the \l {phonon-module.html}
+    {Phonon Module} page this way.
 
-              For example:
+    \code
+      / *!
+          \page phonon-module.html
+          \module Phonon
+          \title Phonon Module
+          \ingroup modules
 
-              \code
-              / *!
-                  \page console-edition-classes.html
-                  \title Qt Console Edition Classes
+          \brief The Phonon module contains namespaces and classes for multimedia functionality.
 
-                  \generatelist{classesbyedition Console}
-              * /
-              \endcode
+          \generatelist{classesbymodule Phonon}
 
-              Together, these arguments provide a table containing the
-              classes considered members of the specified edition,
-              accompanied with a brief description. Each class name is
-              a link to the class's reference documentation.
+	  ...
 
-              The edition a given class can be found in is determined by
-              the module it belongs to.
+      * /
+    \endcode
 
-           \o \c compatclasses
+    Each class that is a member of the specified module must be marked
+    with the \l {inmodule-command} {\\inmodule} command in its \\class
+    comment.
 
-              The \c compatclasses argument provides a complete and
-              alphabetical list of the support classes.  A support
-              class is identified within the documentation by the \l
-              {compat}{\\compat} command. Each class name is a link to
-              the class's reference documentation. The list is
-              rendered similarily to the list generated by the \l
-              {list example}{\c classes} argument.
+    \section2 \c compatclasses
 
-              \warning The \c classesbymodule argument will at some
-              point replace the this argument.
+    The \c compatclasses argument generates a list in alphabetical
+    order of the support classes.  It is normally used only to
+    generate the \l {compatclasses.html} {Qt3 Support Classes} page
+    this way:
 
-           \o \c functionindex
+    \code
+    / *!
+        \page compatclasses.html
+        \title Qt3 Support Classes
+        \ingroup classlists
 
-              The \c functionindex argument provides a complete
-              alphabetical list of all the documented member
-              functions.
+        \brief These classes ease the porting of code from Qt 3 to Qt 4.
 
-              For example:
+        These are the classes that Qt provides for compatibility with Qt
+        3. Most of these are provided by the Qt3Support module.
 
-              \quotation
-                  \raw HTML
-                      <p><center><font size="+1"><b><a href="#a">A</a>&nbsp;<a href="#b">B</a>&nbsp;<a href="#c">C</a>&nbsp;<a href="#d">D</a>&nbsp;<a href="#e">E</a>&nbsp;<a href="#f">F</a>&nbsp;<a href="#g">G</a>&nbsp;<a href="#h">H</a>&nbsp;<a href="#i">I</a>&nbsp;<a href="#j">J</a>&nbsp;<a href="#k">K</a>&nbsp;<a href="#l">L</a>&nbsp;<a href="#m">M</a>&nbsp;<a href="#n">N</a>&nbsp;<a href="#o">O</a>&nbsp;<a href="#p">P</a>&nbsp;<a href="#q">Q</a>&nbsp;<a href="#r">R</a>&nbsp;<a href="#s">S</a>&nbsp;<a href="#t">T</a>&nbsp;<a href="#u">U</a>&nbsp;<a href="#v">V</a>&nbsp;<a href="#w">W</a>&nbsp;<a href="#x">X</a>&nbsp;<a href="#y">Y</a>&nbsp;<a href="#z">Z</a>&nbsp;</b></font></center></p>
+        \generatelist compatclasses
+    * /
+    \endcode
 
-                      <p>DTDHandler: <a href="http://qt.nokia.com/doc/4.0/qxmlreader.html#DTDHandler">QXmlReader</a></p>
+    A support class is identified in the \\class comment with the \l
+    {compat-command} {\\compat} command.
 
-                      <p>QAXCLASS: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXCLASS">global</a></p>
+    \section2 \c functionindex
 
-                      <p>QAXFACTORY_BEGIN: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_BEGIN">global</a></p>
+    The \c functionindex argument provides a complete alphabetical
+    list of all the documented member functions. It is normally used
+    only to generate the \l {functions.html} {Qt function index} page
+    this way:
 
-                      <p>QAXFACTORY_DEFAULT: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_DEFAULT">global</a></p>
+    \code
+    / *!
+        \page functions.html
+        \title All Functions
+        \ingroup funclists
 
-                      <p>QAXFACTORY_END: <a href="http://qt.nokia.com/doc/4.0/qaxfactory.html#QAXFACTORY_END">global</a></p>
+        \brief All documented Qt functions listed alphabetically with a
+        link to where each one is declared.
 
-                  \endraw
+        This is the list of all documented member functions and global
+        functions in the Qt API.  Each function has a link to the
+        class or header file where it is declared and documented.
 
-                  ...
-              \endquotation
-
-           \o \c legalese
-
-              The \c legalese argument provides a complete list of all
-              the licenses. The licenses are identified within the
-              documentation using the \l {legalese}{\\legalese}
-              command.
-
-              For example:
-
-              \quotation
-                  \raw HTML
-                      <hr />
-                      <p>
-                      Copyright (c) 1989 The Regents of the
-                      University of California. All rights reserved.
-                      </p>
-
-                      <p>
-                      Redistribution and use in source and binary
-                      forms are permitted provided that the above
-                      copyright notice and this paragraph are
-                      duplicated in all such forms and that any
-                      documentation, advertising materials, and other
-                      materials related to such distribution and use
-                      acknowledge that the software was developed by
-                      the University of California, Berkeley...
-                      </p>
-
-                      <ul>
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qdate.html#weekNumber">QDate::weekNumber()</a>
-                      </li>
-                      </ul>
-
-                      <hr />
-                      <p>
-                      Copyright (c) 1991 by AT&amp;T.
-                      </p>
-
-                      <p>
-                      Permission to use, copy, modify, and distribute
-                      this software for any purpose without fee is
-                      hereby granted, provided that this entire notice
-                      is included in all copies of any software which
-                      is or includes a copy or modification of this
-                      software and in all copies of the supporting
-                      documentation for such software...
-                      </p>
-
-                      <ul>
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qlocale.html">QLocale</a>
-                      </li>
-                      </ul>
-                      <hr />
-                  \endraw
-                  ...
-              \endquotation
+        \generatelist functionindex
+    * /
+    \endcode
 
-           \o \c mainclasses
+    \section2 \c legalese
 
-              The \c mainclasses argument provides a complete
-              alphabetical list of the main classes. Each class name
-              is a link to the class's reference documentation. A
-              class is related to the group of main classes by using
-              the \l {mainclass}{\\mainclass} command.
+    The \c legalese argument tells QDoc to generate a complete list of
+    licenses in the documentation. Each license is identified using
+    the \l {legalese-command} {\\legalese} command. This command is
+    used to generate the \l {licenses.html} {Qt license information}
+    page this way:
 
-              The list is rendered similarily to the list generated by
-              the \l {list example}{\c classes} argument.
+    \code
+    / *!
+        \page licenses.html
+        \title Other Licenses Used in Qt
+        \ingroup licensing
+        \brief Information about other licenses used for Qt components and third-party code.
+
+        Qt contains some code that is not provided under the
+        \l{GNU General Public License (GPL)},
+        \l{GNU Lesser General Public License (LGPL)} or the
+        \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
+        specific licenses from the original authors. Some pieces of code were developed
+        by Nokia and others originated from third parties.
+        This page lists the licenses used, names the authors, and links
+        to the places where it is used.
+
+        Nokia gratefully acknowledges these and other contributions
+        to Qt. We recommend that programs that use Qt also acknowledge
+        these contributions, and quote these license statements in an
+        appendix to the documentation.
+
+        See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
+
+        \generatelist legalese
+    * /
+    \endcode
 
-           \o \c overviews
+    \section2 \c mainclasses
 
-              The \c overviews argument provides a complete
-              alphabetical overview of the documentation. Each list
-              entry is a link to the respective documentation page.
+    The \c mainclasses argument tells QDoc to generate an alphabetical
+    list of the main classes. A class is marked as a main class by
+    including a \l {mainclass-command} {\\mainclass} command in the
+    \\class comment.
 
-              The list includes pages declared using commands like \l
-              {page}{\\page} and \l {group}{\\group}. The list omits
-              examples and classes, and only lists the first page of
-              documentation that contains two or more pages using
-              commands like \l {nextpage}{\\nextpage}.
+    \note The Qt documentation no longer includes a main classes page,
+    but you can generate one for your main classes if you want it.
 
-              For example:
+    \section2 \c overviews
 
-              \quotation
-                  \raw HTML
-                      <ul>
+    The \c overviews argument is used to tell QDoc to generate a list
+    by concatenating the contents of all the \l {group-command}
+    {\\group} pages. Qt uses it to generate the \l {overviews.html}
+    {overviews} page this way:
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qtalgorithms.html">
-                      &lt;QtAlgorithms&gt; - Generic Algorithms
-                      </a>
-                      </li>
+    \code
+    / *!
+        \page overviews.html
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qtglobal.html">
-                      &lt;QtGlobal&gt; - Global Qt Declarations
-                      </a>
-                      </li>
+        \title All Overviews and HOWTOs
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/qaxserver-demo-simple.html">
-                      A standard ActiveX and the &quot;simple&quot; ActiveQt widget
-                      </a>
-                      </li>
+        \generatelist overviews
+    * /
+    \endcode
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/aboutqt.html">
-                      About Qt
-                      </a>
-                      </li>
+    \section2 \c related
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/trolltech.html">
-                      About Trolltech
-                      </a>
-                      </li>
+    The \c related argument is used in combination with the \l
+    {group-command} {\\group} and \l {ingroup-command} {\\ingroup}
+    commands to list all the overviews related to a specified
+    group. For example, the page for the \l {Programming with Qt}
+    {Programming with Qt} page is generated this way:
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/abstractwidgets.html">
-                      Abstract Widget Classes
-                      </a>
-                      </li>
+    \code
+    / *!
+        \group qt-basic-concepts
+        \title Programming with Qt
 
-                      <li>
-                      <a href="http://qt.nokia.com/doc/4.0/accessibility.html">
-                      Accessibility Classes
-                      </a>
-                      </li>
-                      ...
-                      </ul>
-                  \endraw
-              \endquotation
+        \brief The basic architecture of the Qt cross-platform application and UI framework.
 
-           \o \c related
+        Qt is a cross-platform application and UI framework for
+        writing web-enabled applications for desktop, mobile, and
+        embedded operating systems. This page contains links to
+        articles and overviews explaining key components and
+        techniuqes used in Qt development.
 
-              The \c related argument is used in combination with the
-              \l {group}{\\group} command to list all the overviews
-              related to the given group. Each list entry is a link to
-              the respective documentation page.
+        \generatelist {related}
+    * /
+    \endcode
 
-           \o \c relatedinline
+    Each page listed on this group page contains the command:
 
-              The \c related argument is used in combination with the
-              \l {group}{\\group} command to collect all documentation
-              related to the given group. The various documentation
-              snippets are copied directly into the group page.
+    \code
+        \ingroup qt-basic-concepts
+    \endcode
 
-           \o \c service
+    \section2 \c service
 
-              The \c service argument provides a complete alphabetical
-              list of the services. Each service name is a link to the
-              service's reference documentation.
+    The \c service argument tells QDoc to generate an alphabetical
+    list of the services. Each service name is a link to the service's
+    reference documentation.
 
-              A service is identified within the documentation by the
-              \l {service}{\\service} command.
+    A service is identified with the \l {service-command} {\\service}
+    command.
 
-        \endlist
+    \note This command and the \l {service-command} {\\service}
+    command are not used in the Qt documentation.
 
+    \target if-command
+    \section1 \\if 
 
-    \row
-        \o \bold \\if \target if
-        \o \bold {The \\if command and the corresponding \\endif command
-           enclose parts of a QDoc comment that only will be included if
-           the condition specified by the command's argument is true.}
+    The \\if command and the corresponding \\endif command
+    enclose parts of a QDoc comment that only will be included if
+    the condition specified by the command's argument is true.
 
-           The command reads the rest of the line and parses it as an
-           C++ #if statement. For example:
+    The command reads the rest of the line and parses it as an C++ #if
+    statement.
 
            \code
            / *!
                \if defined(opensourceedition)
 
                \bold{Note:} This edition is for the development of
-               \l{Qt Open Source Edition}{Free and Open Source}
+               \l{Qt Open Source Edition} {Free and Open Source}
                software only; see \l{Qt Commercial Editions}.
 
                \endif
            * /
            \endcode
 
-           This QDoc comment will only be rendered if the \c
-           opensourceedition preprocessor symbol is defined, and
-           specified in the \l {definesvariable}{defines} variable in
-           the configuration file to make QDoc process
-           the code within #ifdef and #endif:
+    This QDoc comment will only be rendered if the \c
+    opensourceedition preprocessor symbol is defined, and specified in
+    the \l {defines-variable} {defines} variable in the configuration
+    file to make QDoc process the code within #ifdef and #endif:
 
            \code
                defines = opensourceedition
            \endcode
 
-           You can also define the preprocessor symbol manually on the
-           command line. For more information see the documentation of
-           the \l {definesvariable}{defines} variable.
+    You can also define the preprocessor symbol manually on the
+    command line. For more information see the documentation of the \l
+    {defines-variable} {defines} variable.
 
-           See also \l{endif}{\\endif}, \l{else}{\\else}, \l
-           {definesvariable}{defines} and \l falsehoods.
+    See also \l{endif-command} {\\endif}, \l{else-command} {\\else},
+    \l {defines-variable} {defines} and \l {falsehoods-variable}
+    {falsehoods}.
 
-    \row
-        \o \bold \\endif \target endif
-        \o \bold {The \\endif command and the corresponding \\if command
-           enclose parts of a QDoc comment that will be included if
-           the condition specified by the \l {if}{\\if} command's
-           argument is true.}
+    \target endif-command
+    \section1 \\endif 
 
-           For more information, see the documentation of the \l
-           {if}{\\if} command.
+    The \\endif command and the corresponding \\if command
+    enclose parts of a QDoc comment that will be included if
+    the condition specified by the \l {if-command} {\\if} command's
+    argument is true.
 
-           See also \l{if}{\\if}, \l{else}{\\else}, \l
-           {definesvariable}{defines} and \l falsehoods.
+    For more information, see the documentation of the \l {if-command}
+    {\\if} command.
 
-    \row
-        \o \bold \\else \target else
-        \o \bold {The \\else command specifies an alternative if the
-           condition in the \l {if}{\\if} command is false.}
+    See also \l{if-command} {\\if}, \l{else-command} {\\else}, \l
+    {defines-variable} {defines} and \l {falsehoods-variable}
+    {falsehoods}.
+
+    \target else-command
+    \section1 \\else 
+
+    The \\else command specifies an alternative if the
+    condition in the \l {if-command} {\\if} command is false.
 
-           The \\else command can only be used within \l
-           {if}{\\if...\\endif} commands, but is useful when there is
-           only two alternatives. For example:
+    The \\else command can only be used within \l {if-command}
+    {\\if...\\endif} commands, but is useful when there is only two
+    alternatives.
 
            \code
            / *!
@@ -4134,8 +3904,8 @@
            * /
            \endcode
 
-           If the \c QT3_SUPPORT is defined, the comment will be rendered
-           as
+    If the \c QT3_SUPPORT is defined, the comment will be rendered
+    like this:
 
            \quotation
                The Qt 3 support library is provided to keep old source
@@ -4146,8 +3916,8 @@
                API to cohabit with the new one.
            \endquotation
 
-           If \c QT3_SUPPORT isn't defined but \c QT3_SUPPORT_WARNINGS
-           is, the comment will be rendered as
+    If \c QT3_SUPPORT is not defined but \c QT3_SUPPORT_WARNINGS is
+    defined, the comment will be rendered like this:
 
            \quotation
                The Qt 3 support library is provided to keep old source
@@ -4186,32 +3956,35 @@
                GCC 3.2+ and MSVC 7.)
            \endquotation
 
-           See also \l{if}{\\if}, \l{endif}{\\endif}, \l
-           {definesvariable}{defines} and \l falsehoods.
-
-    \row
-        \o \bold \\include \target include
-        \o \bold {The \\include command  expands to the contents of the
-            file specified by the command's argument.}
-
-            \warning This is preliminary functionality. For more
-            information, see the \l
-            {26-qdoc-commands-compatibility.html#include-versus-input}
-            {compatibility} section.
-
-            The command takes a file name as an argument, and is
-            useful when some piece of the documentation is used
-            repeatedly: Move the repetetive text into a separate file,
-            and use the \\include command whenever you want to insert
-            the separate documentation.
-
-            The contents of such a file should follow QDoc syntax,
-            excluding the enclosing \c{/}\c{*!} ... \c{*}\c{/} marks.
-            To ensure that QDoc won't attempt to read the file as a
-            stand-alone piece of documentation, we recommend that you
-            use the \c .qdocinc extension.
-
-            For example:
+           See also \l{if-command} {\\if}, \l{endif-command} {\\endif}, \l
+           {defines-variable} {defines} and \l {falsehoods-variable}
+           {falsehoods}.
+
+    \target include-command
+    \section1 \\include 
+
+    The \\include command sends all or part of the file specified by
+    its first argument to the QDoc input stream to be processed as a
+    qdoc comment snippet.  This command is often assigned the alias,
+    \e {input}, in the QDoc configuration file, e.g. \e {alias.include
+    = input}.
+
+    The command is useful when some snippet of commands and text is to
+    be used in multiple places in the documentation. In that case,
+    move the snippet into a separate file and use the \\include
+    command wherever you want to insert the snippet into the
+    documentation. To prevent QDoc from reading the file as a
+    stand-alone page of documentation, we recommend that you use the
+    \c .qdocinc extension for these \e {include} files.
+
+    The command can have either one or two arguments. The first
+    argument is always a file name. The contents of the file must be
+    QDoc input, i.e. a sequence of QDoc commands and text, but without
+    the enclosing qdoc comment \c{/}\c{*!}  ... \c{*}\c{/} delimeters.
+    If you want to include the entire named file, don't use the second
+    argument. If you want to include only part of the file, see the
+    \l{2-argument-form}{two argument form} below. Here is an example
+    of the one argument form:
 
             \code
             / *!
@@ -4224,33 +3997,65 @@
             * /
             \endcode
 
-            will be rendered as
+    Here are links to the \c .qdocinc files used above:
+    \l{signalandslots.qdocinc}, \l{objectmodel.qdocinc},
+    \l{layoutmanagement.qdocinc}. QDoc renders this page as:
 
             \quotation
                 \raw HTML
                 <h1>Core Features</h1>
                 \endraw
 
-                \include examples/signalandslots.qdocinc
-                \include examples/objectmodel.qdocinc
-                \include examples/layoutmanagement.qdocinc
+                \input examples/signalandslots.qdocinc
+                \input examples/objectmodel.qdocinc
+                \input examples/layoutmanagement.qdocinc
             \endquotation
 
-            Here is the actual \c .qdocinc files: \l
-            signalandslots.qdocinc, \l objectmodel.qdocinc, \l
-            layoutmanagement.qdocinc
+    \target 2-argument-form}
+    \section2 \\include filename snippet-identifier
 
-    \row
-        \o \bold \\meta \target meta
-        \o \bold {The \\meta command is the QDoc equivalent to the HTML
-           \c meta tag.}
+    It is kind of a pain to make a separate \c .qdocinc file for every
+    QDoc include snippet you want to use in multiple places in the
+    documentation, especially given that you probably have to put the
+    copyright/license notice in every one of these files. So if you
+    have lots of these include snippets, you can put them all in a
+    single file if you want, and surround each one with:
+    \code
+        //! [snippet-id1]
+
+           QDoc commands and text...
+
+	//! [snippet-id1]
+
+        //! [snippet-id2]
+
+           More QDoc commands and text...
+
+	//! [snippet-id2]
+    \endcode
+
+    Then you can use the two-argument form of the command:
+
+    \code
+        \input examples/signalandslots.qdocinc snippet-id2
+        \input examples/objectmodel.qdocinc another-snippet-id
+    \endcode
+
+    It works as expected. The sequence of QDoc commands and text found
+    between the two tags with the same name as the second argument is
+    sent to the QDoc input stream. You can even nest these snippets,
+    although it's not clear why you would want to do that.
 
-           The command accepts two arguments: The first argument (the
-           following word) is equivalent to the HTML meta tag's \i
-           name variable, and the second argument (the rest of the
-           line) is equivalent to the tag's \i contents variable.
+    \target meta-command
+    \section1 \\meta 
 
-           For example:
+    The \\meta command is the QDoc equivalent to the HTML
+    \c meta tag.
+
+    The command accepts two arguments: The first argument (the
+    following word) is equivalent to the HTML meta tag's \e name
+    variable, and the second argument (the rest of the line) is
+    equivalent to the tag's \e contents variable.
 
            \code
            / *!
@@ -4274,7 +4079,7 @@
            * /
            \endcode
 
-           will be included in the generated HTML page as
+    QDoc renders this as:
 
            \code
            <head>
@@ -4284,13 +4089,12 @@
            </head>
            \endcode
 
-    \row
-        \o \bold \\omit \target omit
-        \o \bold {The \\omit command and the correspondning \\endomit
-           command delimit parts of the documentation that
-           you want QDoc to skip.}
+    \target omit-command
+    \section1 \\omit 
 
-           For example:
+    The \\omit command and the correspondning \\endomit command
+    delimit parts of the documentation that you want QDoc to skip. For
+    example:
 
             \code
             / *!
@@ -4314,7 +4118,7 @@
             * /
             \endcode
 
-            will be rendered as
+    QDoc renders this as:
 
             \raw HTML
                 <table align="center" cellpadding="2"
@@ -4333,94 +4137,115 @@
                 </table>
             \endraw
 
+    \target raw-command
+    \section1 \\raw \span {class="newStuff"} {(avoid)} 
 
-    \row
-        \o \bold \\raw \target raw
-        \o \bold {The \\raw command and the corresponding
-           \\endraw command delimit a block of raw mark-up language code.}
+    The \\raw command and the corresponding
+    \\endraw command delimit a block of raw mark-up language code.
 
-           The command takes an argument specifying the code's format;
-           currently the only supported format is HTML.
+    \note Avoid using this command if possible, because it generates
+    DITA XML code that causes problems. If you are trying to generate
+    special table or list behavior, try to get the behavior you want
+    using the \l {span-command} {\\span} and \l {div-command} {\\div}
+    commands in your \l {table-command} {\\table} or \l {list-command}
+    {\\list}.
+ 
+    The command takes an argument specifying the code's format;
+    currently the only supported format is HTML.
 
-           The \\raw command is useful if you want some special HTML
-           effects in your documentation. For example:
+    The \\raw command is useful if you want some special HTML effects
+    in your documentation.
 
            \code
            / *!
-               Qt has some predefined QColor objects. For example:
+               Qt has some predefined QColor objects.
 
                \raw HTML
                <style type="text/css" id="colorstyles">
-               #blue { background-color: #0000ff; color: #ffffff }
-               #darkBlue { background-color: #000080; color: #ffffff }
-               #cyan { background-color: #00ffff; color: #000000 }
+               #color-blue { background-color: #0000ff; color: #ffffff }
+               #color-darkBlue { background-color: #000080; color: #ffffff }
+               #color-cyan { background-color: #00ffff; color: #000000 }
                </style>
 
                <p>
-               <tt id="blue">Blue(#0000ff)</tt>,
-               <tt id="darkBlue">dark blue(#000080)</tt> and
-               <tt id="cyan">cyan(#00ffff)</tt>.
+               <tt id="color-blue">Blue(#0000ff)</tt>,
+               <tt id="color-darkBlue">dark blue(#000080)</tt> and
+               <tt id="color-cyan">cyan(#00ffff)</tt>.
+	       </p>
                \endraw
            * /
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
-               Qt has some predefined QColor objects. For example:
+               Qt has some predefined QColor objects.
 
                \raw HTML
                <style type="text/css" id="colorstyles">
-               #blue { background-color: #0000ff; color: #ffffff }
-               #darkBlue { background-color: #000080; color: #ffffff }
-               #cyan { background-color: #00ffff; color: #000000 }
+               #color-blue { background-color: #0000ff; color: #ffffff }
+               #color-darkBlue { background-color: #000080; color: #ffffff }
+               #color-cyan { background-color: #00ffff; color: #000000 }
                </style>
 
                <p>
-               <tt id="blue">Blue(#0000ff)</tt>,
-               <tt id="darkBlue">dark blue(#000080)</tt> and
-               <tt id="cyan">cyan(#00ffff)</tt>.
+               <tt id="color-blue">Blue(#0000ff)</tt>,
+               <tt id="color-darkBlue">dark blue(#000080)</tt> and
+               <tt id="color-cyan">cyan(#00ffff)</tt>.
+	       </p>
                \endraw
            \endquotation
 
-    \row
-        \o \bold \\unicode \target unicode
-        \o \bold {The \\unicode command allows you to insert an
-                  arbitrary Unicode character in the document.}
+    \note But you can achieve the exact same thing using qdoc
+    commands. In this case, all you have to do is include the color
+    styles in your style.css file. Then you can write:
+
+	   \code
+           \tt {\span {id="color-blue"} {Blue(#0000ff)}},
+           \tt {\span {id="color-darkBlue"} {dark blue(#000080)}} and
+           \tt {\span {id="color-cyan"} {cyan(#00ffff)}}.
+	   \endcode
+
+	   ...which is rendered again as:
 
-           The command takes an argument specifying the character as
-           an integer. By default, base 10 is assumed, unless a '0x'
-           or '0' prefix is specified (for base 16 and 8,
-           respectively). For example:
+           \tt {\span {id="color-blue"} {Blue(#0000ff)}},
+           \tt {\span {id="color-darkBlue"} {dark blue(#000080)}} and
+           \tt {\span {id="color-cyan"} {cyan(#00ffff)}}.
+
+    \target unicode-command
+    \section1 \\unicode 
+
+    The \\unicode command allows you to insert an arbitrary Unicode
+    character in the document.
+
+    The command takes an argument specifying the character as an
+    integer. By default, base 10 is assumed, unless a '0x' or '0'
+    prefix is specified (for base 16 and 8, respectively). For
+    example:
 
            \code
                 O G\unicode{0xEA}nio e as Rosas
 
                 \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
 
-                \unicode 0x3A3 \i{a}\sub{\i{i}}
+                \unicode 0x3A3 \e{a}\sub{\e{i}}
            \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
            \quotation
                 O G\unicode{0xEA}nio e as Rosas
 
                 \unicode 0xC0 table en famille avec 15 \unicode 0x20AC par jour
 
-                \unicode 0x3A3 \i{a}\sub{\i{i}}
+                \unicode 0x3A3 \e{a}\sub{\e{i}}
            \endquotation
-
-           The \\raw command follows the same conventions as the \l
-           {i}{\\i} command for \l {argument}{punctuation and use of
-           braces} for the argument.
-    \endtable
 */
 
 /*!
     \page 12-1-signalandslots.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title signalandslots.qdocinc
 
@@ -4429,8 +4254,8 @@
 
 /*!
     \page 12-2-objectmodel.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title objectmodel.qdocinc
 
@@ -4439,8 +4264,8 @@
 
 /*!
     \page 12-3-layoutmanagement.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
 
     \title layoutmanagement.qdocinc
 
@@ -4448,71 +4273,54 @@
 */
 
 /*!
-    \page 13-qdoc-commands-topical.html
-    \previouspage Miscellaneous Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Contextual Commands
-
-    \title Topical Commands
-
-    The topical commands tell QDoc what is being documented
-    (i.e. existing units like classes, functions and examples), and
-    some of the commands allows you to create extra pages.
-
-    \section1 Alphabetical List
-
-    \l {13-qdoc-commands-topical.html#class}{\\class},
-    \l {13-qdoc-commands-topical.html#enum}{\\enum},
-    \l {13-qdoc-commands-topical.html#example-command}{\\example},
-    \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage},
-    \l {13-qdoc-commands-topical.html#fn}{\\fn},
-    \l {13-qdoc-commands-topical.html#group}{\\group},
-    \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile},
-    \l {13-qdoc-commands-topical.html#macro}{\\macro},
-    \l {13-qdoc-commands-topical.html#module}{\\module},
-    \l {13-qdoc-commands-topical.html#namespace}{\\namespace},
-    \l {13-qdoc-commands-topical.html#page}{\\page},
-    \l {13-qdoc-commands-topical.html#property}{\\property},
-    \l {13-qdoc-commands-topical.html#service}{\\service},
-    \l {13-qdoc-commands-topical.html#typedef}{\\typedef},
-    \l {13-qdoc-commands-topical.html#variable}{\\variable},
+    \page 13-qdoc-commands-topics.html
+    \previouspage Command Index
+    \contentspage Table of Contents
+    \nextpage Context Commands
 
-    \section1 General Description
+    \title Topic Commands
 
-    When QDoc is processing a comment, it will try to connect the
-    documentation to the source code. For that reason it will first
-    look for the topical commands. If there is no such command, it
-    will try to tie the documentation to the immediately following
-    code. If there is no topical command, and the documentation cannot
-    be tied to following code, the documentation is simply lost.
+    A topic command tells QDoc which source code element is being
+    documented. Some topic commands allow you to create documentation
+    pages that aren't tied to any underlying source code element.
 
-    \target topical argument
+    When QDoc processes a QDoc comment, it tries to connect the
+    comment to an element in the source code by first looking for a
+    topic command that names the source code element. If there is no
+    topic command, QDoc tries to connect the comment to the source
+    code element that immediately follows the comment. If it can't do
+    either of these and if there is no topic command that indicates
+    the comment does not have an underlying source code element (e.g.
+    \l{page-command} {\\page}), then the comment is discarded.
 
-    The documented unit's name is passed as the unique argument for
-    all the topical commands. The argument's naming convention is the
-    documented unit's complete name. For example:
+    \target topic argument
+
+    The name of the thing being documented is the unique argument for
+    each topic command. The naming convention is to use the complete
+    name.
 
     \code
         \enum QComboBox::InsertPolicy
     \endcode
 
-    Functions is a special case, the argument's naming convention for
-    the \l {fn}{\\fn} command is that of the function's definition
-    outside the class definition. For example:
+    The \l {fn-command} {\\fn} command is a special case. For the \l
+    {fn-command} {\\fn} command, use the function's signature
+    including the class qualifier.
 
     \code
-        \fn void PreviewWindow::setWindowFlags()
+        \fn void QGraphicsWidget::setWindowFlags(Qt::WindowFlags wFlags)
     \endcode
 
-    A topical command can appear anywhere in a comment, but must stand
-    alone on its own line. If the argument spans several lines, make
-    sure that each line (except the last one) is ended with a
+    A topic command can appear anywhere in a comment but must stand
+    alone on its own line. Best practice is to put the topic commend
+    at the top of the comment. If the argument spans several lines,
+    make sure that each line (except the last one) is ended with a
     backslash. In addition QDoc counts parentheses, which means that
     if it encounters a '(' it considers everything until the closing
     ')' as its argument.
 
-    If a topical command is repeated with different arguments, the
-    same documentation will appear for both the units. For example:
+    If a topic command is repeated with different arguments, the
+    same documentation will appear for both the units.
 
     \code
     / *!
@@ -4532,232 +4340,224 @@
     ControllerWindow::setWindowFlags() functions will get the same
     documentation.
 
-    \section1 Command Descriptions
+    \target class-command
+    \section1 \\class 
 
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\class \target class
-        \o \bold {The \\class command tells QDoc that a class is
-           part of the public API, and lets you enter a detailed
-           description.}
+    The \\class command is for documenting a C++ class. The argument
+    is the complete name of the class. The command tells QDoc that a
+    class is part of the public API, and lets you enter a detailed
+    description.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument, and supports
-           nested classes, for example:
-
-           \code
-           / *!
-               \class QMap::iterator
+    \code
+    / *!
+        \class QMap::iterator
 
-               \brief The QMap::iterator class provides an STL-style
-               non-const iterator for QMap and QMultiMap.
+        \brief The QMap::iterator class provides an STL-style
+        non-const iterator for QMap and QMultiMap.
 
-               QMap features both \l{STL-style iterators} and
-               \l{Java-style iterators}. The STL-style iterators ...
-           * /
-           \endcode
+        QMap features both \l{STL-style iterators} and
+        \l{Java-style iterators}. The STL-style iterators ...
+    * /
+    \endcode
 
-           The generated HTML documentation for the specified class is
-           put in \c <lower-case>classname.html. For example, the
-           documentation for the \c PreviewWindow class is located in
-           \c previewwindow.html.
+    The HTML documentation for the named class is written to a
+    \c{.html} file named from the class name, in lower case, and with
+    the double colon qulifier(s) replaced with '-'. For example, the
+    documentation for the \c QMap::Iterator class is written to \c
+    qmap-iterator.html.
 
-           \target framework
+    \target framework
 
-           In addition to render the detailed description, the \\class
-           comand will generate the documentation framework, i.e. a
-           list of the class's types, properties, functions, signals
-           and slots with empty documentation.
+    The file contains the class description from the \\class comment,
+    plus the documentation generated from QDoc comments for all the
+    class members, i.e. a list of the class's types, properties,
+    functions, signals, and slots.
 
-           The command is typically accompanied with a \l
-           {brief}{\\brief} command, a \l {mainclass}{\\mainclass}
-           command, an \l {ingroup}{\\ingroup} command and a \l
-           {sa}{\\sa} command. For example:
+    In addition to the detailed description of the class, the \\class
+    comment typically contains a \l {brief-command} {\\brief} command
+    and one or more \l{Markup Commands}. See the \\class command for
+    any of the Qt class for examples. Here is a very simple example:
 
-           \code
-           / *!
-               \class PreviewWindow
-               \brief The PreviewWindow class is a custom widget
-                      displaying the names of its currently set
-                      window flags in a read-only text editor.
+    \code
+    / *!
+        \class PreviewWindow
+        \brief The PreviewWindow class is a custom widget
+               displaying the names of its currently set
+               window flags in a read-only text editor.
 
-               \mainclass
-               \ingroup miscellaneous
+        \ingroup miscellaneous
 
-               The PreviewWindow class inherits QWidget. The widget
-               displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
-               provided with a QPushButton that closes the window.
+        The PreviewWindow class inherits QWidget. The widget
+        displays the names of its window flags set with the \l
+        {function} {setWindowFlags()} function. It is also
+        provided with a QPushButton that closes the window.
 
-               ...
+        ...
 
-              \sa QWidget
-           * /
-           \endcode
+        \sa QWidget
+    * /
+    \endcode
 
-           will be rendered as
+    The way QDoc renders this \\class will depend a lot on your \c
+    {style.css} file, but the general outline of the class reference
+    page will look like this:
 
-           \quotation
-               \raw HTML
-                   <h1>PreviewWindow Class Reference</h1>
-               \endraw
-
-               The PreviewWindow class is a custom widget displaying
-               the names of its currently set window flags in a
-               read-only text editor. \l {preview window}{More...}
+    \quotation
+        \raw HTML
+            <h1>PreviewWindow Class Reference</h1>
+        \endraw
 
-               \raw HTML
-                   <h3>Properties</h3>
-               \endraw
+        The PreviewWindow class is a custom widget displaying
+        the names of its currently set window flags in a
+        read-only text editor. \l {preview window} {More...}
 
-               \list
-                   \o 52 properties inherited from QWidget
-                   \o 1 property inherited from QObject
-               \endlist
+        \raw HTML
+            <h3>Properties</h3>
+        \endraw
 
-               \raw HTML
-                   <h3>Public Functions</h3>
-               \endraw
+        \list
+            \o 52 properties inherited from QWidget
+            \o 1 property inherited from QObject
+        \endlist
 
-               \list
-                   \o \l {constructor}{PreviewWindow}(QWidget *parent = 0)
-                   \o void \l {function}{setWindowFlags}(Qt::WindowFlags flags)
-               \endlist
+        \raw HTML
+            <h3>Public Functions</h3>
+        \endraw
 
-               \list
-                   \o 183 public functions inherited from QWidget
-                   \o 28 public functions inherited from QObject
-               \endlist
+        \list
+            \o \l {constructor} {PreviewWindow}(QWidget *parent = 0)
+            \o void \l {function} {setWindowFlags}(Qt::WindowFlags flags)
+        \endlist
 
-               \raw HTML
-                   <h3>Public Slots</h3>
-               \endraw
+        \list
+            \o 183 public functions inherited from QWidget
+            \o 28 public functions inherited from QObject
+        \endlist
 
-               \list
-                   \o 17 public slots inherited from QWidget
-                   \o 1 public slot inherited from QObject
-               \endlist
+        \raw HTML
+           <h3>Public Slots</h3>
+        \endraw
 
-               \raw HTML
-                   <h3>Additional Inherited Members</h3>
-               \endraw
+        \list
+            \o 17 public slots inherited from QWidget
+            \o 1 public slot inherited from QObject
+        \endlist
 
-               \list
-                   \o 1 signal inherited from QWidget
-                   \o 1 signal inherited from QObject
-                   \o 4 static public members inherited from QWidget
-                   \o 4 static public members inherited from QObject
-                   \o 39 protected functions inherited from QWidget
-                   \o 7 protected functions inherited from QObject
-               \endlist
+        \raw HTML
+            <h3>Additional Inherited Members</h3>
+        \endraw
 
-               \target preview window
+        \list
+            \o 1 signal inherited from QWidget
+            \o 1 signal inherited from QObject
+            \o 4 static public members inherited from QWidget
+            \o 4 static public members inherited from QObject
+            \o 39 protected functions inherited from QWidget
+            \o 7 protected functions inherited from QObject
+        \endlist
 
-               \raw HTML
-                   <hr />
-                   <h2>Detailed Description</h2>
-               \endraw
+        \target preview window
 
-               The PreviewWindow class is a custom widget displaying
-               the names of its currently set window flags in a
-               read-only text editor.
+        \raw HTML
+            <hr />
+            <h2>Detailed Description</h2>
+        \endraw
 
-               The PreviewWindow class inherits QWidget. The widget
-               displays the names of its window flags set with the \l
-               {function}{setWindowFlags()} function. It is also
-               provided with a QPushButton that closes the window.
+        The PreviewWindow class is a custom widget displaying
+        the names of its currently set window flags in a
+        read-only text editor.
 
-               ...
+        The PreviewWindow class inherits QWidget. The widget
+        displays the names of its window flags set with the \l
+        {function} {setWindowFlags()} function. It is also
+        provided with a QPushButton that closes the window.
 
-               See also QWidget.
+        ...
 
-               \raw HTML
-                   <hr />
-                   <h2>Member Function Documentation</h2>
-               \endraw
+        See also QWidget.
 
-               \target constructor
-               \raw HTML
-                   <h3>PreviewWindow(QWidget *parent = 0)</h3>
-               \endraw
+        \raw HTML
+            <hr />
+            <h2>Member Function Documentation</h2>
+        \endraw
 
-               Constructs a preview window widget with \i parent.
+        \target constructor
+        \raw HTML
+           <h3>PreviewWindow(QWidget *parent = 0)</h3>
+        \endraw
 
-               \target function
-               \raw HTML
-                   <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
-               \endraw
+        Constructs a preview window widget with \e parent.
 
-               Sets the widgets flags using the
-               QWidget::setWindowFlags() function.
+        \target function
+        \raw HTML
+            <h3>setWindowFlags(Qt::WindowFlags flags)</h3>
+        \endraw
 
-               Then runs through the available window flags,
-               creating a text that contains the names of the flags
-               that matches the flags parameter, displaying
-               the text in the widgets text editor.
-           \endquotation
+        Sets the widgets flags using the
+        QWidget::setWindowFlags() function.
 
-    \row
-        \o \bold \\enum \target enum
-        \o \bold {The \\enum command allows you to document a C++ enum.}
+        Then runs through the available window flags,
+        creating a text that contains the names of the flags
+        that matches the flags parameter, displaying
+        the text in the widgets text editor.
+    \endquotation
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    \target enum-command
+    \section1 \\enum 
 
-           The enum items are documented using the \l {value}{\\value}
-           command. If an item isn't documented, QDoc will emit a
-           warning. This can be avoided using the \l
-           {omitvalue}{\\omitvalue} command excluding an item from the
-           documentation. The enum documentation will be located in
-           the associated class, header file or namespace
-           documentation.
+    The \\enum command is for documenting a C++ enum type. The
+    argument is the full name of the enum type.
 
-           For example:
+    The enum values are documented in the \\enum comment using the \l
+    {value-command} {\\value} command. If an enum value is not
+    documented with \\value, QDoc emits a warning. These warnings can
+    be avoided using the \l {omitvalue-command} {\\omitvalue} command
+    to tell QDoc that an enum value should not be documented. The enum
+    documentation will be included on the class reference page, header
+    file page, or namespace page where the enum type is defined. For
+    example, consider the enum type \c {Corner} in the Qt namespace:
 
-           \code
-               enum Corner {
-                   TopLeftCorner = 0x00000,
-                   TopRightCorner = 0x00001,
-                   BottomLeftCorner = 0x00002,
-                   BottomRightCorner = 0x00003
-           #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
-                   ,TopLeft = TopLeftCorner,
-                   TopRight = TopRightCorner,
-                   BottomLeft = BottomLeftCorner,
-                   BottomRight = BottomRightCorner
-           #endif
-               };
-           \endcode
+    \code
+        enum Corner {
+            TopLeftCorner = 0x00000,
+            TopRightCorner = 0x00001,
+            BottomLeftCorner = 0x00002,
+            BottomRightCorner = 0x00003
+        #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
+            ,TopLeft = TopLeftCorner,
+            TopRight = TopRightCorner,
+            BottomLeft = BottomLeftCorner,
+            BottomRight = BottomRightCorner
+        #endif
+        };
+    \endcode
 
-           In case of the Qt::Corner enum,
+    This enum can be cocumented this way:
 
-           \code
-           / *!
-               \enum Qt::Corner
-
-               This enum type specifies a corner in a rectangle:
-
-               \value TopLeftCorner
-                      The top-left corner of the rectangle.
-               \value TopRightCorner
-                      The top-right corner of the rectangle.
-               \value BottomLeftCorner
-                      The bottom-left corner of the rectangle.
-               \value BottomRightCorner
-                      The bottom-right corner of the rectangle.
-
-               \omitvalue TopLeft
-               \omitvalue TopRight
-               \omitvalue BottomLeft
-               \omitvalue BottomRight
-           * /
-           \endcode
+    \code
+    / *!
+        \enum Qt::Corner
+
+        This enum type specifies a corner in a rectangle:
+
+        \value TopLeftCorner
+               The top-left corner of the rectangle.
+        \value TopRightCorner
+               The top-right corner of the rectangle.
+        \value BottomLeftCorner
+               The bottom-left corner of the rectangle.
+        \value BottomRightCorner
+               The bottom-right corner of the rectangle.
+
+        \omitvalue TopLeft
+        \omitvalue TopRight
+        \omitvalue BottomLeft
+        \omitvalue BottomRight
+    * /
+    \endcode
 
-           this associated QDoc comment will be rendered as
+    Note the inclusion of the namespace qualifier. QDoc will render
+    this enum type in \c {qt.html} like this:
 
            \quotation
            \raw HTML
@@ -4800,231 +4600,258 @@
            \endraw
            \endquotation
 
-           in qt.html.
+    See also \l {value-command} {\\value} and \l {omitvalue-command} {\\omitvalue}.
 
-           See also \l {value}{\\value} and \l {omitvalue}{\\omitvalue}.
+    \target example-command
+    \section1 \\example 
 
-    \row
-        \o \bold \\example \target example-command
-        \o \bold {The \\example command allows you to document an
-           example.}
+    The \\example command is for documenting an example. The argument
+    is the example's path relative to omne of the paths listed in the
+    \l {exampledirs-variable} {exampledirs} variable in the QDoc
+    configuration file.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. In particular
-           the command's argument is the example's path relative to
-           the paths listed in the \l exampledirs configuration
-           variable.
+    The documentation page will be output to \c {path-to-example}.html.  
+    QDoc will add a list of all the example's source files at the top 
+    of the page.
 
-           The documentation will be located in \i
-           {path-to-example}.html, and QDoc will add a list of all the
-           example files at the top of this documentation page.
+    For example, if \l {exampledirs-variable} {exampledirs} contains
+    \c $QTDIR/examples/widgets/imageviewer, then
 
-           For example, if \l exampledirs contain \c
-           $QTDIR/examples/widgets/imageviewer, then
+    \code
+    / *!
+        \example widgets/imageviewer
+        \title ImageViewer Example
+        \subtitle
 
-           \code
-           / *!
-               \example widgets/imageviewer
-               \title ImageViewer Example
-               \subtitle
+        The example shows how to combine QLabel and QScrollArea
+        to display an image.
 
-               The example shows how to combine QLabel and QScrollArea
-               to display an image.
+        ...
+    * /
+    \endcode
 
-               ...
-           * /
-           \endcode
+    QDoc renders this example in widgets-imageviewer.html:
 
-           will be rendered as
+    \quotation
+        \raw HTML
+        <center><h1>Image Viewer Example</h1></center>
+        \endraw
 
-           \quotation
-               \raw HTML
-               <center><h1>Image Viewer Example</h1></center>
-               \endraw
+        Files:
+        \list
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
+           {widgets/imageviewer/imageviewer.cpp}
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
+           {widgets/imageviewer/imageviewer.h}
+        \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
+           {widgets/imageviewer/main.cpp}
+        \endlist
 
-               Files:
-               \list
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
-                  {widgets/imageviewer/imageviewer.cpp}
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
-                  {widgets/imageviewer/imageviewer.h}
-               \o \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
-                  {widgets/imageviewer/main.cpp}
-               \endlist
+        The example shows how to combine QLabel and QScrollArea
+        to display an image.
 
-               The example shows how to combine QLabel and QScrollArea
-               to display an image.
+        ...
+    \endquotation
 
-               ...
-           \endquotation
+    \target externalpage-command
+    \section1 \\externalpage 
 
-           in widgets-imageviewer.html.
+    The \\externalpage command assigns a title to an external URL.
 
-    \row
-        \o \bold \\fn \target fn
-        \o \bold {The \\fn command allows you to document a function.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. In particular
-           it is important that the return type of the function,
-           whether it is \c const or not and the complete set of
-           arguments with type are included in the argument.  If the
-           referenced function doesn't exist, QDoc will emit a
-           warning.
-
-           Also, the \\fn command is QDoc's default command, i.e. when
-           no topical command can be found within a QDoc comment, QDoc
-           tries to tie the documentation to the following code as if
-           it was function documentation.
-
-           This means that the command normally isn't necessary since
-           the recommended style is to write the function
-           documentation directly before the function implementation
-           in the \c .cpp file. In fact, it should only be used for
-           inline functions implemented in the \c .h file.
-
-           For example:
+    \code
+    / *!
+        \externalpage http://doc.trolltech.com/4.3/qtopiacore.html
+        \title Qtopia Core
+    * /
+    \endcode
 
-           \code
-           / *!
-               \fn bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+    This allows you to include a link to the external page in your
+    documentation this way:
 
-               Returns true if this toolbar is dockable in the given
-               \a area; otherwise returns false.
-           * /
-           \endcode
+    \code
+    / *!
+        The broad scope of the \l {Qtopia Core} API enables it to
+        be used across a wide variety of development projects.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               \raw HTML
-               <h3>bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
-               </h3>
-               \endraw
+    \quotation
+        The broad scope of the \l
+        {http://doc.trolltech.com/4.3/qtopiacore.html} {Qtopia
+        Core} API enables it to be used across a wide variety
+        of development projects.
+    \endquotation
 
-               Returns true if this toolbar is dockable in the given
-               \a area; otherwise returns false.
-           \endquotation
+    To achieve the same result without using the \\externalpage
+    command, you would have to hard code the adress into your
+    documentation:
 
-           See also \l {overload}{\\overload}.
+    \code
+    / *!
+        The broad scope of the \l
+        {http://doc.trolltech.com/4.3/qtopiacore.html} {Qtopia
+        Core} API enables it to be used across a wide variety
+        of development projects.
+    * /
+    \endcode
 
-    \row
-        \o \bold \\group \target group
-        \o \bold {The \\group command creates a separate page that
-           lists the classes belonging to the group specified by the
-           command's argument.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument. The \\group
-           command is typically followed by a \l {title}{\\title}
-           command and a short introduction to the group.  The
-           generated HTML documentation for the specified group is put
-           in <lower-case>\i{group}.html.
-
-           A class can be related to a group by using the \l
-           {ingroup}{\\ingroup} command. In addition, overviews can be
-           related to a group using the same command, but these must
-           be listed explicitly using the \l
-           {generatelist}{\\generatelist} command (see example below).
-
-           Each class is listed with a link to the class reference
-           page and a brief description based on the classes' \l
-           {brief}{\\brief} texts. For example:
+    The \\externalpage command makes it easier to maintain the
+    documentation. If the adress changes, you only need to change the
+    argument of the \\externalpage command.
 
-           \code
-           / *!
-               \group io
+    \target fn-command
+    \section1 \\fn (function)
 
-               \title Input/Output and Networking
+    The \\fn command is for documenting a function. The argument is
+    the function's signature, including its return type, const-ness,
+    and list of formal arguments with types. If the named function
+    doesn't exist, QDoc emits a warning.
 
-               These classes are used to handle input and output to
-               and from external devices, processes, files etc. as
-               well as manipulating files and directories.
-           * /
-           \endcode
+    \note The \\fn command is QDoc's default command, i.e. when no
+    topic command can be found in a QDoc comment, QDoc tries to tie
+    the documentation to the following code as if it is the
+    documentation for a function. Hence, it is normally not necessary
+    to include this command when documenting a function, if the
+    function's QDoc comment is written immediately above the function
+    implementation in the \c .cpp file. But it must be present when
+    documenting an inline function in the \c .cpp file that is
+    implemented in the \c .h file.
 
-           will be rendered as
+    \code
+    / *!
+        \fn bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
 
-           \quotation
-                \raw HTML
+        Returns true if this toolbar is dockable in the given
+        \a area; otherwise returns false.
+    * /
+    \endcode
 
-                <h1>Input/Output and Networking</h1>
-
-                <p>These classes are used to handle input and output
-                to and from external devices, processes, files etc. as
-                well as manipulating files and directories.</p>
-
-                <p>
-                <table width="100%">
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
-                    </b></td>
-                    <td>
-                    The base functionality common to all socket types
-                    </td></tr>
-
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
-                    </b></td>
-                    <td>
-                    QIODevice interface for a QByteArray
-                    </td></tr>
-
-                    <tr valign="top" bgcolor="#e0e0e0">
-                    <td><b>
-                    <a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
-                    </b></td>
-                    <td>
-                    Access to the window system clipboard
-                    </td></tr>
-                </table>
-                \endraw
-           \endquotation
+    QDoc renders this as:
 
-           in io.html.
+    \quotation
+        \raw HTML
+           <h3>bool QToolBar::isAreaAllowed(Qt::ToolBarArea area) const
+           </h3>
+        \endraw
 
-           Note that overviews related to the given group, must be
-           listed explicitly using the \l
-           {generatelist}{\\generatelist} command with the \c related
-           argument. For example:
+        Returns true if this toolbar is dockable in the given
+        \a area; otherwise returns false.
+    \endquotation
 
-           \code
-           / *!
-               \group architecture
+    See also \l {overload-command} {\\overload}.
 
-               \title Architecture
+    \target group-command
+    \section1 \\group 
 
-               These documents describe aspects of Qt's architecture
-               and design, including overviews of core Qt features and
-               technologies.
+    The \\group command creates a separate page that lists the classes
+    belonging to the group. The argument is the group name. 
 
-               \generatelist{related}
-           * /
-           \endcode
+    A class is included in a group by using the \l {ingroup-command}
+    {\\ingroup} command. Overview pages can also be related to a group
+    using the same command, but the list of overview pages must be
+    requested explicitly using the \l {generatelist-command}
+    {\\generatelist} command (see example below).
 
-           See also \l {ingroup}{\\ingroup} and \l
-           {generatelist}{\\generatelist}.
+    The \\group command is typically followed by a \l {title-command}
+    {\\title} command and a short introduction to the group.  The
+    HTML page for the group is written to a \c {.html} file put in
+    <lower-case>\e{group}.html.
 
-    \row
-        \o \bold \\headerfile \target headerfile
-        \o \bold {The \\headerfile command allows you to document
-           global functions, types and macros declared in a header file.}
+    Each class name is listed as a link to the class reference page
+    followed by the text from the class's \l {brief-command} {\\brief}
+    texts.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument, and the
-           generated HTML documentation for the specified header file
-           is put in <lower-case>\i{headerfilename}.html.
+    \code
+    / *!
+        \group io
 
-           A function, type or macro can be associated with a
-           headerfile using the \l {relates}{\\relates} command.
+        \title Input/Output and Networking
 
-           If the referenced header file doesn't exist, the
-           \\headerfile command will still create a documentation page
-           for a header file with the referenced file's name.
+        These classes are used to handle input and output to
+        and from external devices, processes, files etc. as
+        well as manipulating files and directories.
+    * /
+    \endcode
 
-           For example:
+    QDoc generates a group page in \c{io.html} that will look
+    like this:
+
+    \quotation
+         \raw HTML
+
+         <h1>Input/Output and Networking</h1>
+
+         <p>These classes are used to handle input and output
+         to and from external devices, processes, files etc. as
+         well as manipulating files and directories.</p>
+
+         <p>
+         <table width="100%">
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
+             </b></td>
+             <td>
+             The base functionality common to all socket types
+             </td></tr>
+
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
+             </b></td>
+             <td>
+             QIODevice interface for a QByteArray
+             </td></tr>
+
+             <tr valign="top" bgcolor="#e0e0e0">
+             <td><b>
+             <a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
+             </b></td>
+             <td>
+             Access to the window system clipboard
+             </td></tr>
+         </table>
+         \endraw
+    \endquotation
+
+    Note that overview pages related to the group, must be listed
+    explicitly using the \l {generatelist-command} {\\generatelist}
+    command with the \c related argument.
+
+    \code
+    / *!
+        \group architecture
+
+        \title Architecture
+
+        These documents describe aspects of Qt's architecture
+        and design, including overviews of core Qt features and
+        technologies.
+
+        \generatelist{related}
+    * /
+    \endcode
+
+    See also \l {ingroup-command} {\\ingroup} and \l
+    {generatelist-command} {\\generatelist}.
+
+    \target headerfile-command
+    \section1 \\headerfile 
+
+    The \\headerfile command is for documenting the global functions,
+    types and macros that are declared in a header file but not in a
+    namespace. The argument is the name of the header file.  The HTML
+    page is written to a \c {.html} file constructed from the header 
+    file aregument.
+
+    The documentation for a function, type, or macro that is declared
+    in the header file being documented is included in the header file
+    page using the \l {relates-command} {\\relates} command.
+
+    If the argument doesn't exist as a header file, the \\headerfile
+    command creates a documentation page for the header file anyway.
 
            \code
            / *!
@@ -5041,7 +4868,8 @@
            * /
            \endcode
 
-           will be rendered as
+    QDoc generates a header file page \c{qtalgorithms.html} that looks
+    like this:
 
            \quotation
                \raw HTML
@@ -5049,7 +4877,7 @@
                            Generic Algorithms</h1></center>
                <p>The <QtAlgorithms> header file provides generic
                template-based algorithms.
-               <a href="13-qdoc-commands-topical.html#header">More...</a>
+               <a href="13-qdoc-commands-topics.html#header-command">More...</a>
                </p>
 
                <h3>Functions</h3>
@@ -5077,163 +4905,139 @@
                ...
            \endquotation
 
-           in qtalgorithms.html.
-
-    \row
-        \o \bold \\macro \target macro
-        \o \bold {The \\macro command allows you to document a C++ macro.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
-
-           QDoc recognizes three different macro syntax: function-like
-           macros like Q_ASSERT(), declaration-style macros like
-           Q_PROPERTY() and macros without parentheses like Q_OBJECT.
-
-           The \\macro command must be followed by a \l
-           {relates}{\\relates} command which attaches the
-           documentation to that of a related class, header file. or
-           namespace. Otherwise the documentation will be lost.
-
-           For example:
-
-           \code
-           / *!
-               \macro void Q_ASSERT(bool test)
-               \relates <QtGlobal>
-
-               Prints a warning message containing the source code
-               file name and line number if \a test is false.
-
-               ...
-
-               \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
-           * /
-           \endcode
-
-           will be rendered as
-
-           \quotation
-               \raw HTML
-               <h3>void Q_ASSERT ( bool <i>test</i> )</h3>
-               \endraw
+    \target macro-command
+    \section1 \\macro 
 
-               Prints a warning message containing the source code
-               file name and line number if \a test is false.
+    The \\macro command is for documententin a C++ macro. The argument
+    is the macro in one of three styles: function-like macros like
+    Q_ASSERT(), declaration-style macros like Q_PROPERTY(), and macros
+    without parentheses like Q_OBJECT.
 
-               ...
+    The \\macro comment must contain a \l {relates-command}
+    {\\relates} command that attaches the macro comment to a class,
+    header file, or namespace. Otherwise, the documentation will be
+    lost. Here are three example macro comments followed by what they
+    might look like in \c {qtglobal.html} or \c {qobject.html}:
 
-               See also Q_ASSERT_X(), qFatal() and \l {Debugging
-               Techniques}.
-           \endquotation
+    \code
+    / *!
+        \macro void Q_ASSERT(bool test)
+        \relates <QtGlobal>
 
-           in qtglobal.html. And
+        Prints a warning message containing the source code
+        file name and line number if \a test is false.
 
-           \code
-           / *!
-               \macro Q_PROPERTY(...)
-               \relates QObject
+        ...
 
-               This macro declares a QObject property. The syntax is:
+        \sa Q_ASSERT_X(), qFatal(), {Debugging Techniques}
+    * /
+    \endcode
 
-               ...
+    \quotation
+        \raw HTML
+        <h3>void Q_ASSERT ( bool <i>test</i> )</h3>
+        \endraw
 
-               \sa {Qt's Property System}
-           * /
-           \endcode
+        Prints a warning message containing the source code
+        file name and line number if \a test is false.
 
-           will be rendered as
+        ...
 
-           \quotation
-               \raw HTML
-               <h3>Q_PROPERTY ( ... )</h3>
-               \endraw
+        See also Q_ASSERT_X(), qFatal() and \l {Debugging Techniques}.
+ 
+   \endquotation
 
-               This macro declares a QObject property. The syntax is:
+    \code
+    / *!
+        \macro Q_PROPERTY(...)
+        \relates QObject
 
-               ...
+        This macro declares a QObject property. The syntax is:
 
-               See also \l {Qt's Property System}.
-           \endquotation
+        ...
 
-           in qobject.html. And
+        \sa {Qt's Property System}
+    * /
+    \endcode
 
-           \code
-           / *!
-               \macro Q_OBJECT
-               \relates QObject
+    \quotation
+        \raw HTML
+        <h3>Q_PROPERTY ( ... )</h3>
+        \endraw
 
-               The Q_OBJECT macro must appear in the private section
-               of a class definition that declares its own signals and
-               slots or that uses other services provided by Qt's
-               meta-object system.
+        This macro declares a QObject property. The syntax is:
 
-               ...
+        ...
 
-               \sa {Meta-Object System}, {Signals and Slots}, {Qt's
-               Property System}
-           * /
-           \endcode
+        See also \l {Qt's Property System}.
+    \endquotation
 
-           will be rendered as
+    \code
+    / *!
+        \macro Q_OBJECT
+        \relates QObject
 
-           \quotation
-               \raw HTML
-               <h3>Q_OBJECT</h3>
-               \endraw
+        The Q_OBJECT macro must appear in the private section
+        of a class definition that declares its own signals and
+        slots or that uses other services provided by Qt's
+        meta-object system.
 
-               The Q_OBJECT macro must appear in the private section
-               of a class definition that declares its own signals and
-               slots or that uses other services provided by Qt's
-               meta-object system.
+        ...
 
-               ...
+        \sa {Meta-Object System}, {Signals and Slots}, {Qt's
+        Property System}
+    * /
+    \endcode
 
-               See also \l {Meta-Object System}, \l {Signals and
-               Slots} and \l {Qt's Property System}.
-           \endquotation
+    \quotation
+        \raw HTML
+        <h3>Q_OBJECT</h3>
+        \endraw
 
-           in qobject.html.
+        The Q_OBJECT macro must appear in the private section
+        of a class definition that declares its own signals and
+        slots or that uses other services provided by Qt's
+        meta-object system.
 
-    \row
-        \o \bold \\module \target module
-        \o \bold {The \\module creates a separate page that lists the
-           classes belonging to the module specified by the command's
-           argument.}
+        ...
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+        See also \l {Meta-Object System}, \l {Signals &
+        Slots} and \l {Qt's Property System}.
+    \endquotation
 
-           A class can be related to a module using the \l
-           {inmodule}{\\inmodule} command.
+    \target module-command
+    \section1 \\module 
 
-           The \\module command is typically followed by the \l
-           {title}{\\title} and \l {brief}{\\brief} commands. Each
-           class is listed with a link to the class reference page and
-           a brief description based on the classes' \l
-           {brief}{\\brief} texts.
+    The \\module creates a page that lists the classes belonging to
+    the module specified by the command's argument.  A class included
+    in the module by including the \l {inmodule-command} {\\inmodule}
+    command in the \\class comment.
 
-           For example:
+    The \\module command is typically followed by a \l {title-command}
+    {\\title} and a \l {brief-command} {\\brief} command. Each class
+    is listed as a link to the class reference page followed by the
+    text from the class's \l {brief-command} {\\brief} command. For
+    example:
 
-           \code
-           / *!
-               \module QtNetwork
+    \code
+    / *!
+        \module QtNetwork
 
-               \title QtNetwork Module
+        \title QtNetwork Module
 
-               \brief The QtNetwork module offers classes that allow
-               you to write TCP/IP clients and servers.
+        \brief The QtNetwork module offers classes that allow
+        you to write TCP/IP clients and servers.
 
-               The network module provides classes to make network
-               programming easier and portable. It offers both
-               high-level classes such as QHttp and QFtp that
-               implement specific application-level protocols, and
-               lower-level classes such as QTcpSocket, QTcpServer, and
-               QUdpSocket.
-           * /
-           \endcode
+        The network module provides classes to make network
+        programming easier and portable. It offers both
+        high-level classes such as QHttp and QFtp that
+        implement specific application-level protocols, and
+        lower-level classes such as QTcpSocket, QTcpServer, and
+        QUdpSocket.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this in \c {qtnetwork.html} like this:
 
            \quotation
                \raw HTML
@@ -5242,7 +5046,7 @@
 
                The QtNetwork module offers classes that allow you to
                write TCP/IP clients and servers.\l {module
-               details}{More...}
+               details} {More...}
 
                \raw HTML
                <p>
@@ -5296,43 +5100,33 @@
 
            \endquotation
 
-           in qtnetwork.html.
+    See also \l {inmodule-command} {\\inmodule}
 
-           See also \l {inmodule}{\\inmodule}
+    \target namespace-command
+    \section1 \\namespace 
 
-    \row
-        \o \bold \\namespace \target namespace
-        \o \bold {The \\namespace command allows you to document a C++
-           namespace.}
+    The \\namespace command is for documenting the contents of the C++
+    namespace named as its argument. The documentation outline QDoc
+    generates for a namespace is similar to the outline it generates
+    for a C++ class.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
-
-           QDoc will generate the same additional links and
-           documentation for all the members of the namespace as it
-           does for \l {framework}{classes}. The documentation for
-           the specified namespace is put in <lower-case>\i
-           {namespace}.html.
-
-           For example:
-
-           \code
-           / *!
-               \namespace Qt
+    \code
+    / *!
+        \namespace Qt
 
-               \brief The Qt namespace contains miscellaneous
-               identifiers used throughout the Qt library.
-           * /
-           \endcode
+        \brief The Qt namespace contains miscellaneous
+        identifiers used throughout the Qt library.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this in \c{qt.html} like this:
 
            \quotation
                \raw HTML
                <center><h1>Qt Namespace Reference</h1></center>
                <p>The Qt namespace contains miscellaneous
                identifiers used throughout the Qt library.
-               <a href="13-qdoc-commands-topical.html#name">More...</a>
+               <a href="13-qdoc-commands-topics.html#name">More...</a>
                </p>
 
                <pre>#include &lt;Qt&gt;</pre>
@@ -5362,18 +5156,13 @@
                ...
            \endquotation
 
-           in qt.html.
-
-    \row
-        \o \bold \\page \target page
-        \o \bold {The \\page command allows you to create a stand-alone
-           documentation page.}
-
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    \target page-command
+    \section1 \\page 
 
-           The page's title can be set using the \l {title}{\\title}
-           command. For example:
+    The \\page command is for creating a stand-alone documentation
+    page.  The argument is the name of the file where QDoc should
+    store the page. The page title is set using the \l {title-command}
+    {\\title} command.
 
            \code
            / *!
@@ -5398,470 +5187,587 @@
             * /
             \endcode
 
-           will be rendered in its own HTML file: \l{About Qt}.
+    QDoc renders this page in \c {aboutqt.html}.
 
-    \row
-        \o \bold {\\externalpage} \target externalpage
-        \o \bold {The \\externalpage command gives a title to
-            an external URL.}
+    \target property-command
+    \section1 \\property 
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    The \\property command is for documenting a Qt property. The
+    argument is the full property name.
 
-           For example:
+    A property is defined using the Q_PROPERTY() macro. The macro
+    takes as arguments the property's name and its set, reset and get
+    functions.
 
-           \code
-           / *!
-               \externalpage http://www.trolltech.com/products/embedded/index.html
-               \title Qtopia Core
-           * /
-           \endcode
+    \code
+    Q_PROPERTY(QString state READ state WRITE setState)
+    \endcode
 
-           The QDoc comment above allows you to link to the Qtopia
-           Core webpage by simply linking to the given title. For
-           example:
+    The set, reset and get functions don't need to be documented,
+    documenting the property is sufficient. QDoc will generate a list
+    of the access function that will appear in the property
+    documentation which in turn will be located in the documentation
+    of the class that defines the property.
 
-           \code
-           / *!
-               The broad scope of the \l {Qtopia Core} API enables it to
-               be used across a wide variety of development projects.
-           * /
-           \endcode
+    The \\property command comment typically includes a \l
+    {brief-command} {\\brief} command. Forproperties the \l
+    {brief-command} {\\brief} command's argument is a sentence
+    fragment that will be included in a one line description of the
+    property. The command follows the same rules for the \l
+    {brief-property} {description} as the \l {variable-command}
+    {\\variable} command.
 
-           will be rendered as
+    \code
+    / *!
+        \property QPushButton::flat
+        \brief whether the border is disabled
 
-           \quotation
-               The broad scope of the \l
-               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
-               Core} API enables it to be used across a wide variety
-               of development projects.
-           \endquotation
+        This property's default is false.
+    * /
+    \endcode
 
-           To achieve the same result without using the
-           \\externalpage command, you would have to hard code the
-           adress into your documentation:
+    QDoc includes this in \c {qpushbutton.html} like this:
 
-           \code
-           / *!
-               The broad scope of the \l
-               {http://www.trolltech.com/products/embedded/index.html}{Qtopia
-               Core} API enables it to be used across a wide variety
-               of development projects.
-           * /
-           \endcode
+    \quotation
+        \raw HTML
+        <h3>flat : bool</h3>
+        \endraw
 
-           The \\externalpage command makes it easier to maintain the
-           documentation. If the adress changes, you only need to change the
-           argument of the \\externalpage command.
+        This property holds whether the border is disabled.
 
-    \row
-        \o \bold \\property \target property
-        \o \bold {The \\property command allows you to document a Qt
-           property.}
+        This property's default is false.
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+        Access functions:
 
-           A property is defined using the Q_PROPERTY() macro. The
-           macro takes as arguments the property's name and its set,
-           reset and get functions. For example:
+        \list
+        \o \bold { bool isFlat () const}
+        \o \bold { void setFlat ( bool )}
+        \endlist
 
-           \code
-           Q_PROPERTY(QString state READ state WRITE setState)
-           \endcode
+    \endquotation
 
-           The set, reset and get functions don't need to be
-           documented, documenting the property is sufficient. QDoc
-           will generate a list of the access function that will
-           appear in the property documentation which in turn will be
-           located in the documentation of the class that defines the
-           property.
+    \code
+    / *!
+        \property QWidget::width
+        \brief the width of the widget excluding any window frame
 
-           The \\property command is typically accompanied with a \l
-           {brief}{\\brief} command.  In the case of a property, the
-           \l {brief}{\\brief} command's argument is a sentence
-           fragment that will be included in a one-sentence
-           description of the property generated by QDoc. The command
-           follows the same rules for the \l {brief
-           property}{description} as the \l {variable}{\\variable}
-           command.
+        See the \l {Window Geometry} documentation for an
+        overview of window geometry.
 
-           For example:
+        \sa geometry, height, size
+    * /
+    \endcode
 
-           \code
-           / *!
-               \property QPushButton::flat
-               \brief whether the border is disabled
+    QDoc includes this in \c {qwidget.html} like this:
 
-               This property's default is false.
-           * /
-           \endcode
+    \quotation
+        \raw HTML
+        <h3>width : const int</h3>
+        \endraw
 
-           will be rendered as
+        This property holds the width of the widget excluding
+        any window frame.
 
-           \quotation
-               \raw HTML
-               <h3>flat : bool</h3>
-               \endraw
+        See the \l {Window Geometry} documentation for an
+        overview of window geometry.
 
-               This property holds whether the border is disabled.
+        Access functions:
 
-               This property's default is false.
+        \list
+        \o \bold { int width () const}
+        \endlist
 
-               Access functions:
+        See also \l{QWidget::geometry} {geometry},
+        \l{QWidget::height} {height}, and \l{QWidget::size} {size}.
+    \endquotation
 
-               \list
-               \o \bold { bool isFlat () const}
-               \o \bold { void setFlat ( bool )}
-               \endlist
+    \target service-command
+    \section1 \\service 
+
+    The \\service command tells QDoc that a class is a service class
+    and names the service. The command takes two arguments, the name
+    of the class and the name of the service. Currently, this command 
+    is not used in the Qt documentation.
+
+     \code
+         / *!
+             \service TimeService Time
+             ...
+         * /
+         class TimeService : public QCopObjectService
+         {
+             ...
+         }
+     \endcode
+
+     See also \l {class-command} {\\class} and \l
+     {generatelist-command} {\\generatelist}.
+
+    \target qmlattachedproperty-command
+    \section1 \\qmlattachedproperty \span {class="newStuff"} {(new)}
+
+    The \\qmlattachedproperty command is for documenting a QML
+    property that will be attached to some QML element type. See
+    \l{http://doc.trolltech.com/4.7/qdeclarativeintroduction.html#attached-properties}
+    {Attached Properties}. The argument is the rest of the line. The 
+    argument text should be the property type, followed by the QML 
+    element name where the property is being declared, the \c{::}
+    qualifier, and finally the property name. If we have a QML
+    attached property named \c isCurrentItem in QML element \c ListView,
+    and the property has type \c {bool}, the \\qmlattachedproperty for 
+    it would look like this:
 
-           \endquotation
+    \code
+    / *!
+        \qmlattachedproperty bool ListView::isCurrentItem
+        This attached property is true if this delegate is the current 
+	item; otherwise false.
 
-           in qpushbutton.html. And
+        It is attached to each instance of the delegate.
 
-           \code
-           / *!
-               \property QWidget::width
-               \brief the width of the widget excluding any window frame
+        This property may be used to adjust the appearance of the current 
+	item, for example:
 
-               See the \l {Window Geometry} documentation for an
-               overview of window geometry.
+        \snippet doc/src/snippets/declarative/listview/listview.qml isCurrentItem
+    * /
+    \endcode
 
-               \sa geometry, height, size
-           * /
-           \endcode
+    QDoc includes this attached property on the QML reference page for the
+    \l{http://doc.trolltech.com/4.7/qml-listview.html#isCurrentItem-prop} 
+    {ListView} element.
 
-           will be rendered as
+    \target qmlattachedsignal-command
+    \section1 \\qmlattachedsignal  \span {class="newStuff"} {(new)}
 
-           \quotation
-               \raw HTML
-               <h3>width : const int</h3>
-               \endraw
+    The \\qmlattachedsignal command is for documenting an attachable 
+    \l{http://doc.trolltech.com/4.7/qdeclarativeintroduction.html#signal-handlers}
+    {signal handler}. The \\qmlattachedsignal command is used just like 
+    the \l{qmlsignal-command} {\\qmlsignal} command. 
 
-               This property holds the width of the widget excluding
-               any window frame.
+    The argument is the rest of the line. It should be the name of the
+    QML element where the signal handler is declared, the \c{::}
+    qualifier, and finally the signal handler name. If we have a QML
+    attached signal handler named \c onAdd() in the \c GridView
+    element, the \\qmlattachedsignal for it would look like this:
 
-               See the \l {Window Geometry} documentation for an
-               overview of window geometry.
+    \code
+    / *!
+        \qmlattachedsignal GridView::onAdd()
+        This attached handler is called immediately after an item is 
+	added to the view.
+    * /
+    \endcode
 
-               Access functions:
+    QDoc includes this documentation on the QML reference page for the
+    \l{http://doc.trolltech.com/4.7/qml-gridview.html#onAdd-signal}
+    {GridView} element.
 
-               \list
-               \o \bold { int width () const}
-               \endlist
+    \target qmlbasictype-command
+    \section1 \\qmlbasictype  \span {class="newStuff"} {(new)}
 
-               See also \l{QWidget::geometry}{geometry},
-               \l{QWidget::height}{height}, and \l{QWidget::size}{size}.
-           \endquotation
+    The \\qmlbasictype command is for documenting a basic type for QML.
+    The argument is the type name. The type must be included in the 
+    QML basic types group using the \l{ingroup-command}{\\ingroup}
+    command as shown below. This will cause QDoc to include the 
+    documentation for the type on the
+    \l{http://doc.trolltech.com/4.7/qdeclarativebasictypes.html}
+    {QML Basic Types} page. The \l{brief-command} {\\brief} command
+    is also required, because it appears on the 
+    \l{http://doc.trolltech.com/4.7/qdeclarativebasictypes.html}
+    {QML Basic Types} page as well.
 
-           in qwidget.html.
+    \code
+    / *!
+        \qmlbasictype int
+        \ingroup qmlbasictypes
 
-    \row
-        \o \bold \\service \target service
+        \brief An integer is a whole number, e.g. 0, 10, or -20.
 
-        \o \bold {The \\service command tells QDoc that a class is a
-            service class and specifies its alias, i.e. the associated
-            service's name.}
+        An integer is a whole number, e.g. 0, 10, or -20. The possible
+        \c int values range from around -2000000000 to around
+        2000000000, although most elements will only accept a reduced
+        range (which they mention in their documentation).
 
-            The command takes two arguments, the service class's name
-            and the associated alias. For example:
+        Example:
+        \qml
+        Item { width: 100; height: 200 }
+        \endqml
 
-            \code
-                / *!
-                    \service TimeService Time
-                    ...
-                * /
-                class TimeService : public QCopObjectService
-                {
-                    ...
-                }
-            \endcode
+        \sa {QML Basic Types}
+    * /
+    \endcode
 
-            See also \l {class}{\\class} and \l
-            {generatelist}{\\generatelist}.
+    QDoc outputs this as \l{http://doc.trolltech.com/4.7/qml-int.html}
+    {qml-int.html}.
 
-    \row
-        \o \bold \\typedef \target typedef
-        \o \bold {The \\typedef command allows you to document a C++ type
-           definition.}
+    \target qmlclass-command
+    \section1 \\qmlclass  \span {class="newStuff"} {(new)}
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    The \\qmlclass command is for documenting a QML element that is
+    instantiated by a C++ class. The command has two arguments. The
+    first argument is the name of the QML element. The second argument
+    is the name of the C++ class that instantiates the QML element. 
 
-           The documentation will be located in the associated class,
-           header file or namespace documentation. When documenting a
-           global type definition, the \\typedef command must be
-           accompanied with a \l {relates}{\\relates} command. For
-           example:
+    \code
+    / *!
+        \qmlclass Transform QGraphicsTransform
+        \ingroup qml-transform-elements
+        \since 4.7
+        \brief The Transform elements provide a way of building
+        advanced transformations on Items.
 
-           \code
-           / *!
-               \typedef QObjectList
-               \relates QObject
+        The Transform element is a base type which cannot be
+        instantiated directly.  The following concrete Transform types
+        are available:
 
-               Synonym for QList<QObject>.
-           * /
-           \endcode
+        \list
+          \o \l Rotation
+          \o \l Scale
+          \o \l Translate
+        \endlist
 
-           will be rendered as
+        The Transform elements let you create and control advanced
+        transformations that can be configured independently using
+        specialized properties.
 
-           \quotation
-               \raw HTML
-               <h3>typedef QObjectList</h3>
-               \endraw
+        You can assign any number of Transform elements to an \l
+        Item. Each Transform is applied in order, one at a time.
 
-               Synonym for QList<QObject>.
-           \endquotation
+    * /
+    \endcode
 
-           in qobject.html. Another, although more rare, example is
+    This example generates the 
+    \l {http://doc.trolltech.com/4.7/qml-transform.html} {QML Trasform
+    Element} page. The \\qmlclass comment should include the \l
+    {since-command} {\\since} command, because all QML elements are
+    new. It should also include the \l{brief-command} {\\brief}
+    command. And since every QML element is a member of a group of QML
+    elements, it should also include one or more \l{ingroup-command}
+    {\\ingroup} commands.
 
-           \code
-           / *!
-               \typedef QMsgHandler
-               \relates QtGlobal
+    \target qmlmethod-command
+    \section1 \\qmlmethod  \span {class="newStuff"} {(new)}
 
-               This is a typedef for a pointer to a function with the
-               following signature:
+    The \\qmlmethod command is for documenting a QML method. The
+    argument is the complete method signature, including return
+    type and parameter names and types.
 
-               \code
-                   void myMsgHandler(QtMsgType, const char *);
-               \ endcode
+    \code
+    / *!
+        \qmlmethod void TextInput::select(int start, int end)
 
-               \sa QtMsgType, qInstallMsgHandler()
-           * /
-           \endcode
+        Causes the text from \a start to \a end to be selected.
 
-           will be rendered as
+        If either start or end is out of range, the selection is not changed.
 
-           \quotation
-               \raw HTML
-               <h3>typedef QtMsgHandler</h3>
-               \endraw
+        After calling this, selectionStart will become the lesser and
+        selectionEnd will become the greater (regardless of the order
+        passed to this method).
+
+       \sa selectionStart, selectionEnd
+    * / 
+    \endcode
 
-               This is a typedef for a pointer to a function with the
-               following signature:
+    QDoc includes this documentation on the element refence page for the 
+    \l{http://doc.trolltech.com/4.7/qml-textinput.html#select-method}
+    {TextInput} element.
 
-               \raw HTML
-               <tt>
-               <pre>    void myMsgHandler(QtMsgType, const char *);</pre>
-               </tt>
-               \endraw
+    \target qmlproperty-command
+    \section1 \\qmlproperty  \span {class="newStuff"} {(new)}
 
-               See also QtMsgType and qInstallMsgHandler().
+    The \\qmlproperty command is for documenting a QML property. The
+    argument is the rest of the line. The argument text should be the
+    property type, followed by the QML element name, the \c{::}
+    qualifier, and finally the property name. If we have a QML
+    property named \c x in QML element \c Translate, and the property
+    has type \c {real}, the \\qmlproperty for it would look like this:
 
-           \endquotation
+    \code
+        / *!
+            \qmlproperty real Translate::x
 
-           in qtglobal.html. Other type definitions are located in the
-           documentation of the class that defines it, for example:
+            The translation along the X axis.
+        * /
+    \endcode
 
-           \code
-           / *!
-               \typedef QLinkedList::Iterator
+    QDoc includes this QML property on the QML reference page for the
+    \l {http://doc.trolltech.com/4.7/qml-translate.html} {Translate}
+    element.
 
-               Qt-style synonym for QList::iterator.
-           * /
-           \endcode
+    \target qmlsignal-command
+    \section1 \\qmlsignal  \span {class="newStuff"} {(new)}
 
-           will be rendered as
+    The \\qmlsignal command is for documenting a  
+    \l{http://doc.trolltech.com/4.7/qdeclarativeintroduction.html#signal-handlers}
+    {signal handler}.
+    The argument is the rest of the line. It should be the QML element where the
+    signal handler is declared, the \c{::} qualifier, and finally the signal 
+    handler name. If we have a QML signal handler named \c onAdd() in QML 
+    element \c MouseArea, the \\qmlsignal for it would look like this:
 
-           \quotation
-               \raw HTML
-               <h3>typedef QLinkedList::Iterator</h3>
-               \endraw
+    \code
+    / *!
+        \qmlsignal MouseArea::onEntered()
 
-               Qt-style synonym for QList::iterator.
-           \endquotation
+        This handler is called when the mouse enters the mouse area.
 
-           in qlinkedlist.html.
+        By default the onEntered handler is only called while a button is
+        pressed. Setting hoverEnabled to true enables handling of
+        onEntered when no mouse button is pressed.
 
-    \row
-        \o \bold \\variable \target variable
-        \o \bold {The \\variable command allows you to document a
-           member variable or a constant.}
+        \sa hoverEnabled
+    * /
+    \endcode
 
-           The command follows \l {topical argument}{the general
-           topical command convention} for the argument.
+    QDoc includes this documentation on the QML reference page for the
+    \l{http://doc.trolltech.com/4.7/qml-mousearea.html#onEntered-signal}
+    {MouseArea} element.
 
-           The \\variable command is typically followed by a \l
-           {brief}{\\brief} command; QDoc will generate the
-           documentation for the variable based on the brief
-           description. The command follows the same rules for the \l
-           {brief property}{description} as the \l
-           {property}{\\property} command.
+    \target typedef-command
+    \section1 \\typedef 
 
-           The documentation will be located in the in the associated
-           class, header file or namespace documentation.
+    The \\typedef command is for documenting a C++ typedef. The
+    argument is the name of the typedef. The documentation for 
+    the typedef will be included in the refernece documentation 
+    for the class, namespace, or header file in which the typedef 
+    is declared. To relat the \\typedef to a class, namespace, or 
+    header file, the \\typedef comment must contain a
+     \l {relates-command} {\\relates} command.
 
-           In case of a member variable:
+    \code
+    / *!
+        \typedef QObjectList
+        \relates QObject
 
-           \code
-           / *!
-               \variable QStyleOption::palette
-               \brief the palette that should be used when painting
-                      the control
-           * /
-           \endcode
+        Synonym for QList<QObject>.
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc includes this in \c {qobject.html} as:
 
-           \quotation
-               \raw HTML
-               <h3>
-               <a href="http://qt.nokia.com/doc/4.0/qpalette.html">
-               QPalette
-               </a>
-               QStyleOption::palette
-               </h3>
-               \endraw
+    \quotation
+        \raw HTML
+        <h3>typedef QObjectList</h3>
+        \endraw
 
-               This variable holds the palette that should be used
-               when painting the control.
-           \endquotation
+        Synonym for QList<QObject>.
+    \endquotation
 
-           in qstyleoption.html.
+    Another, although more rare, example:
 
-           But you can also use the \\variable command to document
-           constants like for example the \c Type and \c UserType
-           constants in the QTreeWidgetItem class:
+    \code
+    / *!
+        \typedef QMsgHandler
+        \relates QtGlobal
 
-           \code
-           enum { Type = 0, UserType = 1000 };
-           \endcode
+        This is a typedef for a pointer to a function with the
+        following signature:
 
-           Then
+        \code
+            void myMsgHandler(QtMsgType, const char *);
+        \ endcode
 
-           \code
-           / *!
-               \variable QTreeWidgetItem::Type
+        \sa QtMsgType, qInstallMsgHandler()
+    * /
+    \endcode
 
-               The default type for tree widget items.
+    QDoc includes this in \c {qtglobal.html} as:
 
-               \sa UserType, type()
-           * /
-           \endcode
+    \quotation
+        \raw HTML
+        <h3>typedef QtMsgHandler</h3>
+        \endraw
 
-           and
+        This is a typedef for a pointer to a function with the
+        following signature:
 
-           \code
-           / *!
-               \variable QTreeWidgetItem::UserType
+        \raw HTML
+        <tt>
+        <pre>    void myMsgHandler(QtMsgType, const char *);</pre>
+        </tt>
+        \endraw
 
-               The minimum value for custom types. Values below
-               UserType are reserved by Qt.
+        See also QtMsgType and qInstallMsgHandler().
+    \endquotation
 
-               \sa Type, type()
-           * /
-           \endcode
+    Other typedefs are located on the reference page for the class
+    that defines them.
 
-           will be rendered as
+    \code
+    / *!
+        \typedef QLinkedList::Iterator
 
-           \quotation
-               \raw HTML
-               <h3>
-               const int QTreeWidgetItem::Type
-               </h3>
-               \endraw
+        Qt-style synonym for QList::iterator.
+    * /
+    \endcode
 
-               The default type for tree widget items.
+    QDoc includes this one on the reference page for class QLinkedList as:
 
-               See also \l {QTreeWidgetItem::UserType}{UserType} and
-               \l {QTreeWidgetItem::type()}{type()}.
+    \quotation
+        \raw HTML
+        <h3>typedef QLinkedList::Iterator</h3>
+        \endraw
 
-               \raw HTML
-               <h3>
-               const int QTreeWidgetItem::UserType
-               </h3>
-               \endraw
+        Qt-style synonym for QList::iterator.
+    \endquotation
 
-               The minimum value for custom types. Values below
-               UserType are reserved by Qt.
+    \target variable-command
+    \section1 \\variable 
 
-               See also \l {QTreeWidgetItem::Type}{Type} and
-               \l{QTreeWidgetItem::type()}{type()}.
+    The \\variable command is for documenting a class member variable
+    or a constant. The argument is the variable or constant name. The
+    \\variable command comment includes a \l {brief-command} {\\brief}
+    command. QDoc generates the documentation based on the text from
+    \\brief command. 
 
-           \endquotation
+    The documentation will be located in the in the associated class,
+    header file or namespace documentation.
 
-           in qtreewidget.html.
-    \endtable
+    In case of a member variable:
+
+    \code
+    / *!
+        \variable QStyleOption::palette
+        \brief the palette that should be used when painting
+               the control
+    * /
+    \endcode
+
+    QDoc includes this in qstyleoption.html as:
+
+    \quotation
+        \raw HTML
+        <h3>
+            <a href="http://qt.nokia.com/doc/4.0/qpalette.html">
+                QPalette
+            </a>
+            QStyleOption::palette
+        </h3>
+        \endraw
+
+        This variable holds the palette that should be used
+        when painting the control.
+    \endquotation
+
+    You can also document constants with the \\variable command.  For
+    example, suppose you have the \c Type and \c UserType constants in
+    the QTreeWidgetItem class:
+
+    \code
+    enum { Type = 0, UserType = 1000 };
+    \endcode
+
+    For these, the \\vaqriable command can be used this way:
+
+    \code
+    / *!
+        \variable QTreeWidgetItem::Type
+
+        The default type for tree widget items.
+
+        \sa UserType, type()
+    * /
+    \endcode
+    \code
+    / *!
+        \variable QTreeWidgetItem::UserType
+
+        The minimum value for custom types. Values below
+        UserType are reserved by Qt.
+
+        \sa Type, type()
+    * /
+    \endcode
+
+    QDoc includes these in qtreewidget.html as:
+
+    \quotation
+        \raw HTML
+        <h3>
+        const int QTreeWidgetItem::Type
+        </h3>
+        \endraw
+
+        The default type for tree widget items.
+
+        See also \l {QTreeWidgetItem::UserType} {UserType} and \l
+        {QTreeWidgetItem::type()} {type()}.
+
+        \raw HTML
+        <h3>
+        const int QTreeWidgetItem::UserType
+        </h3>
+        \endraw
+
+        The minimum value for custom types. Values below
+        UserType are reserved by Qt.
+
+        See also \l {QTreeWidgetItem::Type} {Type} and
+        \l{QTreeWidgetItem::type()} {type()}.
+
+    \endquotation
 */
 
 /*!
-    \page 14-qdoc-commands-contextualcommands.html
-    \previouspage Topical Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Navigation Commands
-
-    \title Contextual Commands
-
-    The contextual commands provide QDoc with information, that it
-    wouldn't figure out otherwise, about the documented object. For
-    example whether a class is thread-safe or not.
-
-    These commands can appear anywhere within a QDoc comment.
-
-    \section1 Alphabetical List
-
-    \l {16-qdoc-commands-status.html#compat}{\\compat},
-    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
-    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
-    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
-    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
-    \l {16-qdoc-commands-status.html#internal}{\\internal},
-    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
-    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
-    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
-    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
-    \l {18-qdoc-commands-relating.html#overload}{\\overload},
-    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
-    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
-    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
-    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
-    \l {18-qdoc-commands-relating.html#relates}{\\relates},
-    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage},
-    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe},
-    \l {20-qdoc-commands-title.html#title}{\\title}
+    \page 14-qdoc-commands-contextcommands.html
+    \previouspage Topic Commands
+    \contentspage Table of Contents
+    \nextpage Document Navigation
+
+    \title Context Commands
+
+    The context commands provide information about the element being
+    documented that QDoc can't deduce on its own. e.g. Is a class
+    thread-safe? Is a function reentrant? Which module is the class a
+    member of? Context commands can appear anywhere in a QDoc comment,
+    but they are normally placed near the top of the comment, just
+    below the \l {Topic Commands} {topic} command.
 
-    \section1 Categories
     \list
-    \o \l {Navigation Commands}
-    \o \l {Status Commands}
-    \o \l {Thread Support Commands}
-    \o \l {Relating Commands}
-    \o \l {Grouping Commands}
-    \o \l {Title Commands}
+      \o \l {16-qdoc-commands-status.html#compat-command}{\\compat},
+      \o \l {15-qdoc-commands-navigation.html#contentspage-command}{\\contentspage},
+      \o \l {15-qdoc-commands-navigation.html#indexpage-command}{\\indexpage},
+      \o \l {19-qdoc-commands-grouping.html#ingroup-command}{\\ingroup},
+      \o \l {18-qdoc-commands-relating.html#inherits-command}{\\inherits},
+      \o \l {19-qdoc-commands-grouping.html#inmodule-command}{\\inmodule},
+      \o \l {16-qdoc-commands-status.html#internal-command}{\\internal},
+      \o \l {19-qdoc-commands-grouping.html#mainclass-command}{\\mainclass},
+      \o \l {15-qdoc-commands-navigation.html#nextpage-command}{\\nextpage},
+      \o \l {17-qdoc-commands-thread.html#nonreentrant-command}{\\nonreentrant},
+      \o \l {16-qdoc-commands-status.html#obsolete-command}{\\obsolete},
+      \o \l {18-qdoc-commands-relating.html#overload-command}{\\overload},
+      \o \l {16-qdoc-commands-status.html#preliminary-command}{\\preliminary},
+      \o \l {15-qdoc-commands-navigation.html#previouspage-command}{\\previouspage},
+      \o \l {17-qdoc-commands-thread.html#reentrant-command}{\\reentrant},
+      \o \l {18-qdoc-commands-relating.html#reimp-command}{\\reimp},
+      \o \l {18-qdoc-commands-relating.html#relates-command}{\\relates},
+      \o \l {16-qdoc-commands-status.html#since-command}{\\since},
+      \o \l {15-qdoc-commands-navigation.html#startpage-command}{\\startpage},
+      \o \l {20-qdoc-commands-namingthings.html#subtitle-command}{\\subtitle}
+      \o \l {17-qdoc-commands-thread.html#threadsafe-command}{\\threadsafe},
+      \o \l {20-qdoc-commands-namingthings.html#title-command}{\\title}
     \endlist
+
 */
 
 /*!
     \page 15-qdoc-commands-navigation.html
-    \previouspage Contextual Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Status Commands
-
-    \title Navigation Commands
-
-    The navigation commands allow you to link the pages of a multipage
-    document together. They provide the components of a navigation bar
-    at the top and bottom of the document. They also provide browser
-    and search engine support.
+    \previouspage Context Commands
+    \contentspage Table of Contents
+    \nextpage Reporting Status
 
-    \section1 Alphabetical List
+    \title Document Navigation
 
-    \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage},
-    \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage},
-    \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage},
-    \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage},
-    \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
+    The navigation commands are for linking the pages of a document in
+    a meaningful sequence. Below is a sequence of QDoc comments that
+    shows a typical use of the navigation commands.
 
-    \section1 General Description
-
-    The QDoc comments below shows a typical example using the
-    navigation commands.
+    \section1 Example
 
     \code
     / *!
         \page basicqt.html
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
         \nextpage Getting Started
 
         \indexpage Index
@@ -5885,7 +5791,7 @@
     / *!
         \page gettingstarted.html
         \previouspage Basic Qt
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
         \nextpage Creating Dialogs
 
         \indexpage Index
@@ -5901,7 +5807,7 @@
     / *!
         \page creatingdialogs.html
         \previouspage Getting Started
-        \contentspage {Basic Qt}{Contents}
+        \contentspage {Basic Qt} {Contents}
 
         \indexpage Index
         \startpage Basic Qt
@@ -5927,8 +5833,7 @@
     * /
     \endcode
 
-    The second page of this multipage document, "Getting Started",
-    will be rendered as
+    QDoc renders the  "Getting Started" page in \c{creatingdialogs.html}:
 
     \quotation
     \raw HTML
@@ -5963,18 +5868,16 @@
     \endraw
     \endquotation
 
-    in creatingdialogs.html.
-
-    In addition, the \l {indexpage}{\\indexpage} and \l
-    {startpage}{\\startpage} commands specifies links to the page's
-    index page and start page. These links are used by browsers and
-    search engines.
+    The \l {indexpage-command} {\\indexpage} and \l
+    {startpage-command} {\\startpage} commands create links to the
+    page's index page and start page. These links can be used by
+    browsers and search engines.
 
     The index page is typically an alphabetical list of the document's
     titles and topics, while the start page is the page considered by
     the author to be the starting point of a multipage document.
 
-    The links are included in the generated HTML source code but has
+    The links are included in the generated HTML source code but have
     no visual effect on the documentation:
 
     \code
@@ -5986,414 +5889,377 @@
     </head>
     \endcode
 
-    \section1 Command Descriptions
-
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\previouspage \target previouspage
-        \o \bold {The \\previouspage command links the current page
-           to the previous one in an ordered series of documents}.
-
-           The command has two arguments, each enclosed by curly
-           braces: The first is the link target, i.e. the title of the
-           previous page, the second is the link text. If the page's
-           title is equivalent to the link text, the second argument
-           can be omitted.
-
-           The command must stand alone on its own line.
-
-           In the end, the link is rendered at the top and bottom of
-           the current page. For an example, see the \l {General
-           Description} section.
+    \section1 Commands
 
-    \row
-        \o \bold \\nextpage \target nextpage
-        \o \bold {The \\nextpage command links the current
-           page to the next page in an ordered series of documents}.
+    \target previouspage-command
+    \section2 \\previouspage 
 
-           The command follows the same syntax and argument convention
-           as the \l {previouspage}{\\previouspage} command.
+    The \\previouspage command links the current page to the previous
+    page in a sequence.a The command has two arguments, each enclosed
+    by curly braces: The first is the link target, i.e. the title of
+    the previous page, the second is the link text. If the page's
+    title is equivalent to the link text, the second argument can be
+    omitted.
 
-           For an example, see the \l {General Description} section.
+    The command must stand alone on its own line.
 
-    \row
-        \o \bold \\startpage \target startpage
-        \o \bold {The \\startpage command specifies the first document
-           in a collection of documents.}
+    \target nextpage-command
+    \section2 \\nextpage 
 
-           The command must stand alone on its own line, and its
-           unique argument is the title of the first document.
+    The \\nextpage command links the current page to the next page in
+    a sequence. The command follows the same syntax and argument
+    convention as the \l {previouspage-command} {\\previouspage}
+    command.
 
-           QDoc will generate a link to the specified document which
-           is included in the HTML file but has no visual effect on
-           the documentation. The generated link type tells browsers
-           and search engines which document is considered by the
-           author to be the starting point of the collection.
+    \target startpage-command
+    \section2 \\startpage 
 
-           For an example, see the \l {General Description} section.
+    The \\startpage command specifies the first page of a sequence of
+    pages. The command must stand alone on its own line, and its
+    unique argument is the title of the first document.
 
-    \row
-        \o \bold \\contentspage \target contentspage
-        \o \bold {The \\contentspage command links the current
-           page to a contents page}.
+    QDoc will generate a link to the start page and include it in the
+    generated HTML file, but this has no visual effect on the
+    documentation. The generated link type tells browsers and search
+    engines which document is considered by the author to be the
+    starting point of the collection.
 
-           The command follows the same syntax and argument convention
-           as the \l {previouspage}{\\previouspage} command.
+    \target contentspage-command
+    \section2 \\contentspage
 
-           For an example, see the \l {General Description} section.
-
-    \row
-        \o \bold \\indexpage \target indexpage
-        \o \bold {The \\indexpage command specifies a document providing
-           an index for the current document}.
+    The \\contentspage command links the current page to a table of
+    contents page. The command follows the same syntax and argument
+    convention as the \l {previouspage-command} {\\previouspage}
+    command.
 
-           The command must stand alone on its own line, and its
-           unique argument is the title of the index document.
+    \target indexpage-command
+    \section2 \\indexpage 
 
-           QDoc will generate a link to the specified document which
-           is included in the HTML file but has no visual effect on
-           the documentation. The generated link type tells browsers
-           and search engines which document is considered by the
-           author to be the index page for the current document.
+    The \\indexpage command specifies an index page for the current
+    document. The command must stand alone on its own line, and its
+    unique argument is the title of the index document.
 
-           For an example, see the \l {General Description} section.
-
-    \endtable
+    QDoc will generate a link to the index page and include it in the
+    generated HTML file, but this has no visual effect on the
+    documentation. The generated link type tells browsers and search
+    engines which document is considered by the author to be the
+    index page of the collection.
 */
 
 /*!
     \page 16-qdoc-commands-status.html
-    \previouspage Navigation Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Thread Support Commands
+    \previouspage Document Navigation
+    \contentspage Table of Contents
+    \nextpage Thread Support
 
-    \title Status Commands
+    \title Reporting Status
 
-    The usage commands can indicate whether a documented object is
-    under development, becoming obsolete, provided for compatibility
-    reasons or simply not part of the public interface. They can
-    describe the history of minor versions. And they can also describe
-    a documented object's ability to handle multithreaded programming.
+    These commands are for indicating that a documented element is
+    still under development, is becoming obsolete, is provided for
+    compatibility reasons, or is simply not to be included in the
+    public interface. The \l {since-command}{\\since} command is for
+    including information about the version when a function or class
+    first appeared.
 
-    \section1 Alphabetical List
+    \target compat-command
+    \section1 \\compat 
 
-    \l {16-qdoc-commands-status.html#compat}{\\compat},
-    \l {16-qdoc-commands-status.html#internal}{\\internal},
-    \l {16-qdoc-commands-status.html#obsolete}{\\obsolete},
-    \l {16-qdoc-commands-status.html#preliminary}{\\preliminary},
-    \l {16-qdoc-commands-status.html#since}{\\since}
+    The \\compat command is for indicating that a class or function is
+    part of the support library provided to keep old source code
+    working.
 
-    \section1 Command Description
+    The command must stand on its own line.
 
-    \table
-    \header
-        \o Command
-        \o Description
-
-    \row
-        \o \bold \\preliminary \target preliminary
-        \o \bold {The \\preliminary command indicates that the
-           referenced function is under development.}
-
-           The command must stand on its own line.
+    Usually an equivalent function or class is provided as an
+    alternative.
 
-           The \\preliminary command expands to a notification in the
-           function documentation, and marks the function as
-           preliminary when it appears in lists. For example:
+    If the command is used in the documentation of a class, the
+    command expands to a warning that the referenced class is part of
+    the support library. The warning is located at the top of the
+    documentation page.
 
-           \code
-           / *!
-               \preliminary
-
-               Returns information about the joining properties of the
-               character (needed for certain languages such as
-               Arabic).
-           * /
-           QChar::Joining QChar::joining() const
-           {
-               return ::joining(*this);
-           }
-           \endcode
+    \code
+    / *!
+        \class MyQt3SupportClass
+        \compat
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this at the top of the MyQt3SupportClass class
+    reference page.
 
-           \quotation
-               \raw HTML
-               <h3>
-               <a href="http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum">Joining</a>
-               QChar::joining () const</h3>
-               \endraw
+    \quotation
+        \bold {This class is part of the Qt 3 support
+        library.} It is provided to keep old source code
+        working. We strongly advise against using it in new
+        code. See the \l
+        {http://qt.nokia.com/doc/4.0/porting4.html} {Porting
+        Guide} for more information.
+    \endquotation
 
-               \bold {This function is under development and
-               is subject to change.}
+    If the command is used when documenting a function, QDoc will
+    create and link to a separate page documenting Qt 3 support
+    members when generating the reference documentation for the
+    associated class.
 
-               Returns information about the joining properties of the
-               character (needed for certain languages such as
-               Arabic).
-           \endquotation
+    \code
+    / *!
+        \fn MyClass::MyQt3SupportMemberFunction
+        \compat
 
-           And the function's entry in QChar's list of functions will
-           be rendered as
+        Use MyNewFunction() instead.
+    * /
+    \endcode
 
-         \quotation
-             \list
-             \o ...
-             \o Joining
-                \l {http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum}
-                   {joining}()
-                const   \c (preliminary)
-             \o ...
-             \endlist
-         \endquotation
+    QDoc renders this in \c{myclass-qt3.html} as:
 
-    \row
-        \o \bold \\obsolete \target obsolete
-        \o \bold {The \\obsolete command indicates that the referenced
-           function no longer should be used in new code;
-           there is no guarantee for how long it will remain in
-           the library.}
-
-           The command must stand on its own line.
+    \quotation
+        \raw HTML
+        <h1>Qt 3 Support Members for MyClass</h1>
+        \endraw
 
-           When generating the reference documentation for a class,
-           QDoc will create and link to a separate page documenting
-           its obsolete functions.  Usually an equivalent function is
-           provided as an alternative.
+        \bold {The following class members are part of the Qt 3
+        support layer.} They are provided to help you port old code to
+        Qt 4. We advise against using them in new code.
 
-           For example:
+        ...
 
-           \code
-           / *!
-               \fn MyClass::MyObsoleteFunction
-               \obsolete
+        \list
+            \o void MyQt3SupportMemberFunction()
+            \o ...
+        \endlist
 
-               Use MyNewFunction() instead.
-           * /
-           \endcode
+        \raw HTML
+        <hr />
+        <h2>Member Function Documentation</h2>
+        <h3>void MyQt3SupportMemberFunction ()</h3>
+        <p>Use MyNewFunction() instead.</p>
+        \endraw
+        ...
+    \endquotation
 
-           will be rendered as
+    \target default-command
+    \section1 \\default  \span {class="newStuff"} {(new)}
 
-           \quotation
-               \raw HTML
-               <h1>Obsolete Members for MyClass</h1>
-               \endraw
+    The \\default command is for marking a QML property as the 
+    \l {http://doc.trolltech.com/4.7/qdeclarativeintroduction.html#default-properties}
+    {default property}. The word \span {class="newStuff"} {default} is shown in red in
+    the documentation of the property.
 
-               \bold {The following class members are obsolete.} They
-               are provided to keep old source code working. We
-               strongly advise against using them in new code.
+    \code
+    / *!
+        \qmlproperty list<Change> State::changes
+        This property holds the changes to apply for this state
+        \default
 
-               ...
+        By default these changes are applied against the default state. If the state
+        extends another state, then the changes are applied against the state being
+        extended.
+    * /
+    \endcode
 
-               \list
-                   \o void MyObsoleteFunction() \c (obsolete)
-                   \o ...
-               \endlist
+    See how QDoc renders this property on the reference page for the
+    \l {http://doc.trolltech.com/4.7/qml-state.html#changes-prop} {State}
+    element.
 
-               \raw HTML
-               <hr />
-               <h2>Member Function Documentation</h2>
-               <h3>void MyObsoleteFunction ()</h3>
-               <p>Use MyNewFunction() instead.</p>
-               \endraw
+    \target obsolete-command
+    \section1 \\obsolete 
 
-               ...
-           \endquotation
+    The \\obsolete command is for indicating that a function is being
+    deprecated, and it should no longer be used in new code. There is
+    no guarantee for how long it will remain in the library.
 
-           in myclass-obsolete.html
+    The command must stand on its own line.
 
+    When generating the reference documentation for a class, QDoc will
+    create and link to a separate page documenting its obsolete
+    functions.  Usually an equivalent function is provided as an
+    alternative.
 
-    \row
-        \o \bold \\compat \target compat
-        \o \bold {The \\compat command indicates that the referenced class
-           or function is part of the support library provided to keep
-           old source code working.}
+    \code
+    / *!
+        \fn MyClass::MyObsoleteFunction
+        \obsolete
 
-           The command must stand on its own line.
+        Use MyNewFunction() instead.
+    * /
+    \endcode
 
-           Usually an equivalent function or class is provided as an
-           alternative.
+    QDoc renders this in \c{myclass-obsolete.html} as:
 
-           If the command is used within the documentation of a class,
-           the command expands to a warning that the referenced class
-           is part of the support library. The warning is located on
-           top of the associated documentation. For example:
+    \quotation
+        \raw HTML
+        <h1>Obsolete Members for MyClass</h1>
+        \endraw
 
-           \code
-           / *!
-               \class MyQt3SupportClass
-               \compat
-           * /
-           \endcode
+        \bold {The following class members are obsolete.} They are
+        provided to keep old source code working. We strongly advise
+        against using them in new code.
 
-           will be rendered as
+        ...
 
-           \quotation
-               \bold {This class is part of the Qt 3 support
-               library.} It is provided to keep old source code
-               working. We strongly advise against using it in new
-               code. See the \l
-               {http://qt.nokia.com/doc/4.0/porting4.html}{Porting
-               Guide} for more information.
-           \endquotation
+        \list
+            \o void MyObsoleteFunction() \c (obsolete)
+            \o ...
+        \endlist
 
-           on the top of the MyQt3SupportClass class reference.
+        \raw HTML
+        <hr />
+        <h2>Member Function Documentation</h2>
+        <h3>void MyObsoleteFunction ()</h3>
+        <p>Use MyNewFunction() instead.</p>
+        \endraw
+        ...
+    \endquotation
 
-           If the command is used when documenting a function, QDoc
-           will create and link to a separate page documenting Qt 3
-           support members when generating the reference documentation
-           for the associated class. For example:
+    \target internal-command
+    \section1 \\internal 
 
-           \code
-           / *!
-               \fn MyClass::MyQt3SupportMemberFunction
-               \compat
+    The \\internal command indicates that the referenced
+    function is not part of the public interface.
 
-               Use MyNewFunction() instead.
-           * /
-           \endcode
+    The command must stand on its own line.
 
-           will be rendered as
+    QDoc ignores the documentation as well as the documented item,
+    when generating the associated class reference documenation.
 
-           \quotation
-               \raw HTML
-               <h1>Qt 3 Support Members for MyClass</h1>
-               \endraw
+    \code
+    / *!
+        \internal
 
-               \bold {The following class members are part of the Qt
-               3 support layer.} They are provided to help you port
-               old code to Qt 4. We advise against using them in new
-               code.
+        Tries to find the decimal separator. If it can't find
+        it and the thousand delimiter is != '.' it will try to
+        find a '.';
+    * /
+    int QDoubleSpinBoxPrivate::findDelimiter
+            (const QString &str, int index) const
+    {
+        int dotindex = str.indexOf(delimiter, index);
+        if (dotindex == -1 && thousand != dot && delimiter != dot)
+            dotindex = str.indexOf(dot, index);
+        return dotindex;
+    }
+    \endcode
 
-               ...
+    This function will not be included in the documentation.
 
-               \list
-                   \o void MyQt3SupportMemberFunction()
-                   \o ...
-               \endlist
+    \target preliminary-command
+    \section1 \\preliminary 
 
-               \raw HTML
-               <hr />
-               <h2>Member Function Documentation</h2>
-               <h3>void MyQt3SupportMemberFunction ()</h3>
-               <p>Use MyNewFunction() instead.</p>
-               \endraw
+    The \\preliminary command is for indicating that a referenced
+    function is still under development.
 
-               ...
-           \endquotation
+    The command must stand on its own line.
 
-           in myclass-qt3.html
+    The \\preliminary command expands to a notification in the
+    function documentation, and marks the function as preliminary when
+    it appears in lists.
 
+    \code
+    / *!
+        \preliminary
 
-    \row
-        \o \bold \\internal \target internal
-        \o \bold {The \\internal command indicates that the referenced
-           function is not part of the public interface.}
+        Returns information about the joining properties of the
+        character (needed for certain languages such as
+        Arabic).
+    * /
+    QChar::Joining QChar::joining() const
+    {
+        return ::joining(*this);
+    }
+    \endcode
 
-           The command must stand on its own line.
+    QDoc renders this as:
 
-           QDoc ignores the documentation as well as the documented
-           item, when generating the associated class reference
-           documenation. For example:
+    \quotation
+        \raw HTML
+        <h3>
+        <a href="http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum">Joining</a>
+        QChar::joining () const</h3>
+        \endraw
 
-           \code
-           / *!
-               \internal
+        \bold {This function is under development and
+    	subject to change.}
 
-               Tries to find the decimal separator. If it can't find
-               it and the thousand delimiter is != '.' it will try to
-               find a '.';
-           * /
-           int QDoubleSpinBoxPrivate::findDelimiter
-                   (const QString &str, int index) const
-           {
-               int dotindex = str.indexOf(delimiter, index);
-               if (dotindex == -1 && thousand != dot && delimiter != dot)
-                   dotindex = str.indexOf(dot, index);
-               return dotindex;
-           }
-           \endcode
+        Returns information about the joining properties of the
+        character (needed for certain languages such as
+        Arabic).
+    \endquotation
 
-           in qspinbox.cpp, will not be rendered at all.
+    And the function's entry in QChar's list of functions will be
+    rendered as:
 
-    \row
-        \o \bold \\since \target since
-        \o \bold {The \\since command tells in which minor release
-           the associated functionality was added.}
+    \quotation
+        \list
+        \o ...
+        \o Joining
+           \l {http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum}
+              {joining}()
+           const   \c (preliminary)
+       \o ...
+       \endlist
+    \endquotation
 
-           For example:
+    \target since-command
+    \section1 \\since 
 
-           \code
-           / *!
-               \since 4.1
+    The \\since command tells in which minor release
+    the associated functionality was added.
 
-               Returns an icon for \a standardIcon.
+    \code
+    / *!
+        \since 4.1
 
-               ...
+        Returns an icon for \a standardIcon.
 
-               \sa standardIconImplementation(), standardPixmap()
-           * /
-           QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const
-           {
-           }
-           \endcode
+        ...
 
-           will be rendered as
+        \sa standardIconImplementation(), standardPixmap()
+    * /
+    QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const
+    {
+    }
+    \endcode
 
-           \quotation
-               \raw HTML
-               <h3>QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const</h3>
-               \endraw
+    QDoc renders this as:
 
-               This function was introduced in Qt version 4.1
+    \quotation
+        \raw HTML
+        <h3>QIcon QStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const</h3>
+        \endraw
 
-               Returns an icon for \a standardIcon.
+        This function was introduced in Qt version 4.1
 
-               ...
+        Returns an icon for \a standardIcon.
 
-               See also \l
-               {QStyle::standardIconImplementation()}{standardIconImplementation()}
-               and \l {QStyle::standardPixmap()}{standardPixmap()}.
-               \endquotation
+        ...
 
-           QDoc generates the "Qt" reference from the \l
-           {25-qdoc-configuration-derivedprojects.html#project}{\c
-           project} configuration variable. For that reason this
-           reference will change according to the current
-           documentation project.
+        See also \l {QStyle::standardIconImplementation()}
+        {standardIconImplementation()} and \l
+        {QStyle::standardPixmap()} {standardPixmap()}.
+    \endquotation
 
-           See also \l
-           {25-qdoc-configuration-derivedprojects.html#project}{\c
-           project}.
+    QDoc generates the "Qt" reference from the \l
+    {25-qdoc-configuration-derivedprojects.html#project} {\c project}
+    configuration variable. For that reason this reference will change
+    according to the current documentation project.
 
-    \endtable
+    See also \l {25-qdoc-configuration-derivedprojects.html#project}
+    {\c project}.
 */
 
 /*!
     \page 17-qdoc-commands-thread.html
-    \previouspage Status Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Relating Commands
-
-    \title Thread Support Commands
-
-    The thread support commands specify the level of support for
-    multithreaded programming of a class or function.
-
-    \section1 Alphabetical List
+    \previouspage Reporting Status
+    \contentspage Table of Contents
+    \nextpage Relating Things
 
-    \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant},
-    \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant},
-    \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
+    \title Thread Support
 
-    \section1 General Description
-
-    There are three levels of support for multithreaded programming of
-    a class or function: \c threadsafe, \c reentrant and \c
-    nonreentrant.
+    The thread support commands are for specifying the level of
+    support for multithreaded programming in a class or function.
+    There are three levels of support: \c threadsafe, \c reentrant and
+    \c nonreentrant.
 
     The default is \c nonreentrant which means that the associated
     class or function cannot be called by multiple threads. \c
@@ -6406,15 +6272,14 @@
     can be called simultaneously by multiple threads even when each
     invocation references shared data.
 
-    When a class is declared \c reentrant or \c threadsafe, using the
-    \l {reentrant}{\\reentrant} and \l {threadsafe}{\\threadsafe}
-    commands respectively, functions in the referenced class can be
-    declared \c nonreentrant, using the \l
-    {nonreentrant}{\\nonreentrant} command, excluding the functions
-    from the general view.
+    When a class is marked \l {reentrant-command} {\\reentrant} or \l
+    {threadsafe-command} {\\threadsafe}, functions in that class can
+    be marked \c nonreentrant using the \l {nonreentrant-command}
+    {\\nonreentrant} command. 
 
-    For example:
+    \section1 Example
 
+    \target reentrant-example
     \code
     / *!
         \class QLocale
@@ -6453,7 +6318,7 @@
     }
     \endcode
 
-    will be rendered as
+    QDoc renders this as:
 
     \quotation
         \raw HTML
@@ -6468,8 +6333,8 @@
         \endcode
 
         \bold {Note:} All the functions in this class are \l
-        {threads.html#reentrant}{reentrant}, except \l
-        {QLocale::setDefault()}{setDefault()}.
+        {threads.html#reentrant} {reentrant}, except \l
+        {QLocale::setDefault()} {setDefault()}.
 
         ...
 
@@ -6495,8 +6360,8 @@
 
         \warning This function is not reentrant.
 
-        See also \l {QLocale::system()}{system()} and \l
-        {QLocale::c()}{c()}.
+        See also \l {QLocale::system()} {system()} and \l
+        {QLocale::c()} {c()}.
 
         ...
     \endquotation
@@ -6504,7 +6369,7 @@
     As shown above, QDoc generates a notification when a class is
     declared reentrant, and lists the exceptions (the declared
     nonreentrant functions). A link to the general documentation on \l
-    {threads.html#reentrant}{reentrancy and thread-safety} is
+    {threads.html#reentrant} {reentrancy and thread-safety} is
     included.  In addition a warning, "\bold Warning: This function is
     not reentrant.", is generated in the nonreentrant functions'
     documentation.
@@ -6513,514 +6378,488 @@
     is declared threadsafe.
 
     For more information see the general documentation on \l
-    {threads.html#reentrant}{reentrancy and thread-safety}.
+    {threads.html#reentrant} {reentrancy and thread-safety}.
 
-    \section1 Command Descriptions
+    \section1 Commands
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \target threadsafe-command
+    \section2 \\threadsafe 
 
-    \row
-        \o \bold \\threadsafe \target threadsafe
-        \o \bold {The \\threadsafe command indicates that the
-           associated class or function can be called simultaneously by
-           multiple threads even when each invocation references
-           shared data.}
+    The \\threadsafe command includes a line in the documentation to
+    indicate that the associated class or function is \e threadsafe
+    and can be called simultaneously by multiple threads, even when
+    separate invocations reference shared data.
 
-           The command must stand on its own line.
+    The command must stand on its own line.
 
-           The generated documentation resulting from using the
-           \\threadsafe command is similar to the result of using the
-           \l {reentrant}{\\reentrant} command. For an example, see
-           the \l {General Description} section.
+    The documentation generated from this command will be similar to
+    the what is generated for the \l {reentrant-command} {\\reentrant}
+    command. See the example above in the \l {reentrant-example}
+    {introduction}.
 
-           See also \l{reentrant}{\\reentrant} and
-           \l{nonreentrant}{\\nonreentrant}.
+    See also \l{reentrant-command} {\\reentrant} and
+    \l{nonreentrant-command} {\\nonreentrant}.
 
-    \row
-        \o \bold \\reentrant \target reentrant
-        \o \bold {The \\reentrant command indicates that the associated
-           class or function  can be called simultaneously
-           by multiple threads, provided that each invocation of the
-           functions reference unique data.}
+    \target reentrant-command
+    \section2 \\reentrant 
 
-           The command must stand on its own line.
+    The \\reentrant command indicates that the associated class or
+    function can be called simultaneously by multiple threads,
+    provided that each invocation references its own data. See the \l
+    {reentrant-example} {example} above.
 
-           For an example, see the \l {General Description} section.
+    The command must stand on its own line.
 
-           See also \l{nonreentrant}{\\nonreentrant} and
-            \l{threadsafe}{\\threadsafe}.
+    See also \l{nonreentrant-command} {\\nonreentrant} and
+    \l{threadsafe-command} {\\threadsafe}.
 
-    \row
-        \o \bold \\nonreentrant \target nonreentrant
-        \o \bold {The \\nonreentrant command indicates that the
-           associated class or function cannot be called by
-           multiple threads.}
+    \target nonreentrant-command
+    \section2 \\nonreentrant 
 
-           The command must stand on its own line.
+    The \\nonreentrant command indicates that the associated class or
+    function cannot be called by multiple threads. Nonreentrant is the
+    default case. 
 
-           For an example, see the \l {General Description} section.
+    The command must stand on its own line.
 
-           See also \l{reentrant}{\\reentrant} and
-           \l{threadsafe}{\\threadsafe}.
+    When a class is marked \l {reentrant-command} {\\reentrant} or \l
+    {threadsafe-command} {\\threadsafe}, functions in that class can
+    be marked \c nonreentrant using this command in the \l{fn-command}
+    {\\fn} comment of the functions to be excluded.
 
-    \endtable
+    See also \l{reentrant-command} {\\reentrant} and
+    \l{threadsafe-command} {\\threadsafe}.
 */
 
 /*!
     \page 18-qdoc-commands-relating.html
-    \previouspage Thread Support Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Grouping Commands
+    \previouspage Thread Support
+    \contentspage Table of Contents
+    \nextpage Grouping Things
 
-    \title Relating Commands
+    \title Relating Things
 
-    The relation commands discribe how the documented object relates
-    to its context: Whether it is an overloaded function, a
-    reimplemented function or a global function related to a specified
-    class or header file.
+    The relating commands are for specifying how one documented
+    element relates to another documented element. e.g., This function
+    is an overload of another function, or this function is a
+    reimplementation of another function, or this typedef is \e
+    related to some class or header file. There is also a command
+    for documenting that a QML element inherits some other QML 
+    element.
 
-    \section1 Alphabetical List
+    \section1 Commands
 
-    \l {18-qdoc-commands-relating.html#overload}{\\overload},
-    \l {18-qdoc-commands-relating.html#reimp}{\\reimp},
-    \l {18-qdoc-commands-relating.html#relates}{\\relates},
+    \target inherits-command
+    \section2 \\inherits  \span {class="newStuff"} {(new)}
 
-    \section1 Command Descriptions
+    The \\inherits command is for documenting that one QML element 
+    inherits some other QML element. It must be included in the 
+    inheriting element's \l{qmlclass-command}{\\qmlclass} comment.
+    The argument is the name of the inherited QML element. 
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \code
+    / *!
+        \qmlclass PauseAnimation QDeclarativePauseAnimation
+        \ingroup qml-animation-transition
+        \since 4.7
+        \inherits Animation
+        \brief The PauseAnimation element provides a pause for an animation.
 
-    \row
-        \o \bold \\overload \target overload
-        \o \bold {The \\overload command indicates that the 
-           function is a secondary overload of its name.}
+        When used in a SequentialAnimation, PauseAnimation is a step
+        when nothing happens, for a specified duration.
 
-           The command must stand on its own line.
+        A 500ms animation sequence, with a 100ms pause between two animations:
 
-           For any overloaded function (except constructors), QDoc
-           expects one primary version of the function and all the 
-	   the overloads marked with the \bold{\\overload command}.
-           The primary version should be fully documented. Each 
-	   overload can have whatever extra documentation you want
-	   to add for just that overload. 
+        SequentialAnimation {
+            NumberAnimation { ... duration: 200 }
+            PauseAnimation { duration: 100 }
+            NumberAnimation { ... duration: 200 }
+        }
 
-	   From Qt 4.5, you can include the function name plus '()'
-	   as a parameter to the \bold{\\overload} command, which 
-	   will include a standard \i{This function overloads...} 
-	   line of text with a link to the documentation for the 
-	   primary version of the function. 
+        \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    * /
+    \endcode
 
-	   For example:
+    QDoc includes this line on the reference page for the
+    \l{http://doc.trolltech.com/4.7/qml-pauseanimation.html} {PauseAnimation}
+    element:
 
-           \code
-           / *!
-               \overload addAction()
+    \quotation
+        Inherits \l{http://doc.trolltech.com/4.7/qml-animation.html} {Animation}
+    \endquotation
 
-               This convenience function creates a new action with an
-               \a icon and some \a text. The function adds the newly
-               created action to the menu's list of actions, and
-               returns it.
+    \target overload-command
+    \section2 \\overload 
 
-               \sa QWidget::addAction()
-           * /
-           QAction *QMenu::addAction(const QIcon &icon, const QString &text)
-           {
-               QAction *ret = new QAction(icon, text, this);
-               addAction(ret);
-               return ret;
-           }
-           \endcode
+    The \\overload command is for indicating that a function is a
+    secondary overload of its name.
 
-           will be rendered as
+    The command must stand on its own line.
 
-           \quotation
-               \raw HTML
-               <h3><a href="http://qt.nokia.com/doc/4.0/qaction.html">QAction</a>
-               * QMenu::addAction ( const QIcon & <i>icon</i>,
-               const QString & <i>text</i> )
-               </h3>
-               \endraw
+    For a function name that is overloaded (except constructors), QDoc
+    expects one primary version of the function, and all the others
+    marked with the \bold {\\overload command}.  The primary version
+    should be fully documented. Each overload can have whatever extra
+    documentation you want to add for just that overloaded version.
 
-	       This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}{addAction()}
+    From Qt 4.5, you can include the function name plus '()' as a
+    parameter to the \bold{\\overload} command, which will include a
+    standard \e{This function overloads...}  line of text with a link
+    to the documentation for the primary version of the function.
 
-               This convenience function creates a new action with an
-               \i icon and some \i text. The function adds the newly
-               created action to the menu's list of actions, and
-               returns it.
+    \code
+    / *!
+        \overload addAction()
 
-               See also
-               \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}
-               {QWidget::addAction}().
-           \endquotation
+        This convenience function creates a new action with an
+        \a icon and some \a text. The function adds the newly
+        created action to the menu's list of actions, and
+        returns it.
 
-	   If you don't include the function name with the
-	   \bold{\\overlaod} command, then instead of the "This
-	   function overloads..." line with the link to the
-	   documentation for the primary version, you get the old
-	   standard line:
+        \sa QWidget::addAction()
+    * /
+    QAction *QMenu::addAction(const QIcon &icon, const QString &text)
+    {
+        QAction *ret = new QAction(icon, text, this);
+        addAction(ret);
+        return ret;
+    }
+    \endcode
 
-	   \quotation
-               This is an overloaded member function, provided for
-               convenience. 
-	   \endquotation.
+    QDoc renders this as:
 
-    \row
-        \o \bold \\reimp \target reimp
-        \o \bold {The \\reimp command indicates that the
-           referenced function is a reimplementation of a virtual function,
-           where the reimplementation has no effect on the interface.}
+    \quotation
+        \raw HTML
+        <h3><a href="http://qt.nokia.com/doc/4.0/qaction.html">QAction</a>
+        * QMenu::addAction ( const QIcon & <i>icon</i>,
+        const QString & <i>text</i> )
+        </h3>
+        \endraw
 
-           The command must stand on its own line.
+	This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction} {addAction()}
 
-           QDoc will omit the reimplemented function from the class
-           reference. For example:
+        This convenience function creates a new action with an
+        \e icon and some \e text. The function adds the newly
+        created action to the menu's list of actions, and
+        returns it.
 
-           \code
-           / *!
-               \reimp
-           * /
-           void QToolButton::nextCheckState()
-           {
-               Q_D(QToolButton);
-               if (!d->defaultAction)
-                   QAbstractButton::nextCheckState();
-               else
-                   d->defaultAction->trigger();
-           }
-           \endcode
+        See also
+        \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}
+        {QWidget::addAction}().
+    \endquotation
 
-           will not be rendered at all; only a link to the inherited
-           QAbstractButton::nextCheckState() will appear in the
-           documentation.
+    If you don't include the function name with the \bold{\\overlaod}
+    command, then instead of the "This function overloads..." line
+    with the link to the documentation for the primary version, you
+    get the old standard line:
 
-    \row
-        \o \bold \\relates \target relates
-        \o \bold {The \\relates command attaches the documentation of
-           a global function to that of a related class or header file.}
+    \quotation
+        This is an overloaded member function, provided for
+        convenience. 
+    \endquotation.
 
-           The command's argument is a class name, an the command (and
-           its argument) must stand on its own line.
+    \target reimp-command
+    \section2 \\reimp 
 
-           \code
-           / *!
-               \relates QChar
+    The \\reimp command is for indicating that a function is a
+    reimplementation of a virtual function.
 
-               Reads a char from the stream \a in into char \a chr.
+    The command must stand on its own line.
 
-               \sa {Format of the QDataStream operators}
-           * /
-           QDataStream &operator>>(QDataStream &in, QChar &chr)
-           {
-               quint16 u;
-               in >> u;
-               chr.unicode() = ushort(u);
-               return in;
-           }
-           \endcode
+    QDoc will omit the reimplemented function from the class
+    reference.
 
-           will be rendered with the QChar documentation.
+    \code
+    / *!
+        \reimp
+    * /
+    void QToolButton::nextCheckState()
+    {
+        Q_D(QToolButton);
+        if (!d->defaultAction)
+            QAbstractButton::nextCheckState();
+        else
+            d->defaultAction->trigger();
+    }
+    \endcode
 
-    \endtable
+    This function will not be included in the documentation. Instead,
+    a link to the base function QAbstractButton::nextCheckState() will
+    appear in the documentation.
+
+    \target relates-command
+    \section2 \\relates 
+
+    The \\relates command is for including the documentation of a
+    global element to some class or header file. The argument is a
+    class name or header file.
+
+    \code
+    / *!
+        \relates QChar
+
+        Reads a char from the stream \a in into char \a chr.
+
+        \sa {Format of the QDataStream operators}
+    * /
+    QDataStream &operator>>(QDataStream &in, QChar &chr)
+    {
+        quint16 u;
+        in >> u;
+        chr.unicode() = ushort(u);
+        return in;
+    }
+    \endcode
+ 
+    The documentation for this function will be included on the reference page 
+    for class QChra.
 */
 
 /*!
     \page 19-qdoc-commands-grouping.html
-    \previouspage Relating Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage Title Commands
+    \previouspage Relating Things
+    \contentspage Table of Contents
+    \nextpage Naming Things
 
-    \title Grouping Commands
+    \title Grouping Things
 
     The grouping commands relate classes to defined groups and
     modules. The groups are used when generating lists of related
     classes in the documentation, while the modules are elements of
     Qt's structure.
 
-    \section1 Alphabetical List
+    \section1 Commands
 
-    \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup},
-    \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule},
-    \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass},
+    \target mainclass-command
+    \section2 \\mainclass 
 
-    \section1 Command Descriptions
+    The \\mainclass command relates the documented class to
+    a group called mainclasses.
 
-    \table
-    \header
-        \o Command
-        \o Description
+    The command must stand on its own line.
 
-    \row
-        \o \bold \\mainclass \target mainclass
-        \o \bold {The \\mainclass command relates the documented class to
-           a group called mainclasses.}
+    \code
+    / *!
+        \class QWidget qwidget.h
+        \brief The QWidget class is the base class of
+        all user interface objects.
 
-           The command must stand on its own line.
+        \mainclass
 
-           For example:
+        ...
+    * /
+    \endcode
 
-           \code
-           / *!
-               \class QWidget qwidget.h
-               \brief The QWidget class is the base class of
-               all user interface objects.
+    This will include the QWidget class in the \e mainclasses
+    group, which means, for example, that the class will appear on the
+    list created by calling the \l {generatelist-command}
+    {\\generatelist} command with the \c mainclasses argument:
 
-               \mainclass
+    \l http://qt.nokia.com/doc/4.0/mainclasses.html
 
-               ...
-           * /
-           \endcode
+    \note The Qt documentation no longer includes the \e mainclasses
+    page.
 
-           will ensure that the QWidget class is included in the \c
-           mainclasses group, which means, for example, that the class
-           will appear on the list created by calling the \l
-           {generatelist}{\\generatelist} command with the \c
-           mainclasses argument:
+    See also \l {generatelist-command} {\\generatelist}.
 
-           \l http://qt.nokia.com/doc/4.0/mainclasses.html
+    \target ingroup-command
+    \section2 \\ingroup 
 
-           See also \l {generatelist}{\\generatelist}.
+    The \\ingroup command indicates that the given
+    overview or documented class belongs to a certain group of
+    related docmentation.
 
-    \row
-        \o \bold \\ingroup \target ingroup
+    A class or overview may belong to many groups.
 
-        \o \bold {The \\ingroup command indicates that the given
-           overview or documented class belongs to a certain group of
-           related docmentation.}
+    The \\ingroup command's argument is a group name, but note
+    that the command considers the rest of the line as part of
+    its argument. Make sure that the group name is followed by
+    a linebreak.
 
-           A class or overview may belong to many groups.
+    \code
+    / *!
+        \class QDir
+        \brief The QDir class provides access to directory
+               structures and their contents.
 
-           The \\ingroup command's argument is a group name, but note
-           that the command considers the rest of the line as part of
-           its argument. Make sure that the group name is followed by
-           a linebreak. For example:
+        \ingroup io
+        ...
+    * /
+    \endcode
 
-           \code
-           / *!
-               \class QDir
-               \brief The QDir class provides access to directory
-                      structures and their contents.
+    This will include the QDir class in the \c io group, which means,
+    for example, that QDir will appear on the list created by calling
+    the \l {group-command} {\\group} command with the \c io argument.
 
-               \ingroup io
-               ...
-           * /
-           \endcode
+    To list overviews that are related to a certain group, you must
+    generate the list explicitly using the \l {generatelist-command}
+    {\\generatelist} command with the \c related argument.
 
-           will ensure that the QDir class is included in the \c io
-           group, which means, for example, that QDir will appear on
-           the list created by calling the \l {group}{\\group} command
-           with the \c io argument.
+    See also \l {group-command} {\\group}.
 
-           Note that to list overviews that are related to a given
-           group, you must generate the list exlicitly by using the \l
-           {generatelist}{\\generatelist} command with the \c related
-           argument.
+    \target inmodule-command
+    \section2 \\inmodule 
 
-           See also \l {group}{\\group}.
-    \row
-        \o \bold \\inmodule \target inmodule
-        \o \bold {The \\inmodule command relates the documented class
-           to the module specified by the command's argument.}
+    The \\inmodule command relates a class to the module specified by
+    the command's argument.
 
-           For the basic classes in Qt, a class's module is determined
-           by its location, i.e. its directory. However, for
-           extensions, like ActiveQt and Qt Designer, a class needs to
-           be related to a module explicitly.
+    For the basic classes in Qt, a class's module is determined by its
+    location, i.e. its directory. However, for extensions, like
+    ActiveQt and Qt Designer, a class must be related to a module
+    explicitly.
 
-           The command's argument is a module name, but note that the
-           command considers the rest of the line as part of its
-           argument. Make sure that the module name is followed by a
-           linebreak. For example:
+    The command's argument is a module name, but note that the command
+    considers the rest of the line as part of its argument. Make sure
+    that the module name is followed by a linebreak.
 
-           \code
-           /*!
-               \class QDesignerTaskMenuExtension
-               \inmodule QtDesigner
-           * /
-           \endcode
+    \code
+    /*!
+        \class QDesignerTaskMenuExtension
+        \inmodule QtDesigner
+    * /
+    \endcode
 
-           will ensure that the QDesignerTaskMenuExtension class is
-           included in the \c QtDesigner module, which means, for
-           example, that the class will appear on the list created by
-           calling the \l {generatelist}{\\generatelist} command with
-           the \c {{classesbymodule QtDesigner}} argument.
+    This ensures that the QDesignerTaskMenuExtension class is included
+    in the \c QtDesigner module, which means, for example, that the
+    class will appear on the list created by calling the \l
+    {generatelist-command} {\\generatelist} command with the \c
+    {{classesbymodule QtDesigner}} argument.
 
-           See also \l {module}{\\module} and \l
-           {generatelist}{\\generatelist}.
-    \endtable
+    See also \l {module-command} {\\module} and \l
+    {generatelist-command} {\\generatelist}.
 */
 
 /*!
-    \page 20-qdoc-commands-title.html
-    \previouspage Grouping Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Configuration
-
-    \title Title Commands
-
-    In general a title command considers everything that follows it
-    until the first line break as its argument.  If the title needs to
-    be spanned over several lines, make sure to end each line (except
-    the last one) with a backslash.
-
-    \section1 Alphabetical List
-
-    \l {20-qdoc-commands-title.html#title}{\\title},
-    \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
-
-    \section1 Command Descriptions
+    \page 20-qdoc-commands-namingthings.html
+    \previouspage Grouping Things
+    \contentspage Table of Contents
+    \nextpage Markup Commands
 
-    \table
-    \header
-        \o Command
-        \o Description
+    \title Naming Things
 
-    \row
-        \o \bold \\title \target title
-        \o \bold {The \\title command sets the title for a
-           documentation page, or allows you to override it.}
+    In general, a title command considers everything that follows it
+    until the first line break as its argument.  If the title is so
+    long it must span multiple lines, end each line (except the last
+    one) with a backslash.
 
-           For example:
+    \section1 Commands
 
-           \code
-           / *!
-               \page signalandslots.html
+    \target title-command
+    \section2 \\title 
 
-               \title Signals and Slots
+    The \\title command sets the title for a documentation page, or
+    allows you to override it.
 
-               Signals and slots are used for communication between
-               objects. The signals and slots mechanism is a central
-               feature of Qt and probably the part that differs most
-               from the features provided by other frameworks.
+    \code
+    / *!
+        \page signalandslots.html
 
-               ...
-           * /
-           \endcode
+        \title Signals & Slots
 
-           will be rendered as
+        Signals and slots are used for communication between
+        objects. The signals and slots mechanism is a central
+        feature of Qt and probably the part that differs most
+        from the features provided by other frameworks.
 
-           \quotation
-               \raw HTML
-                   <h1><center>Signal and Slots</center></h1>
-               \endraw
+        ...
+    * /
+    \endcode
 
-               Signals and slots are used for communication between
-               objects. The signals and slots mechanism is a central
-               feature of Qt and probably the part that differs most
-               from the features provided by other frameworks.
+    QDoc renders this as:
 
-               ...
-           \endquotation
-           See also \l {subtitle}{\\subtitle}.
+    \quotation
+        \raw HTML
+            <h1><center>Signal and Slots</center></h1>
+        \endraw
 
-    \row
-        \o \bold \\subtitle \target subtitle
-        \o \bold {The \\subtitle command sets a subtitle for a
-           documentation page.}
+        Signals and slots are used for communication between
+        objects. The signals and slots mechanism is a central
+        feature of Qt and probably the part that differs most
+        from the features provided by other frameworks.
+        ...
+    \endquotation
+    See also \l {subtitle-command} {\\subtitle}.
 
-           For example:
+    \target subtitle-command
+    \section2 \\subtitle 
 
-           \code
-           / *!
-               \page qtopiacore-overview.html
+    The \\subtitle command sets a subtitle for a documentation page.
 
-               \title Qtopia Core
-               \subtitle Qt for Embedded Linux
+    \code
+    / *!
+        \page qtopiacore-overview.html
 
-               Qt/Embedded, the embedded Linux port of Qt, is a
-               complete and self-contained C++ GUI and platform
-               development tool for Linux-based embedded development.
+        \title Qtopia Core
+        \subtitle Qt for Embedded Linux
 
-               ...
-           * /
-           \endcode
+        Qt/Embedded, the embedded Linux port of Qt, is a
+        complete and self-contained C++ GUI and platform
+        development tool for Linux-based embedded development.
+        ...
+    * /
+    \endcode
 
-           will be rendered as
+    QDoc renders this as:
 
-           \quotation
-               \raw HTML
-                   <h1><center>Qtopia Core</center></h1>
-                   <h2><center>Qt for Embedded Linux</center></h2>
-               \endraw
+    \quotation
+        \raw HTML
+            <h1><center>Qtopia Core</center></h1>
+            <h2><center>Qt for Embedded Linux</center></h2>
+        \endraw
 
-               Qt/Embedded, the embedded Linux port of Qt, is a
-               complete and self-contained C++ GUI and platform
-               development tool for Linux-based embedded development.
+        Qt/Embedded, the embedded Linux port of Qt, is a
+        complete and self-contained C++ GUI and platform
+        development tool for Linux-based embedded development.
+        ...
+    \endquotation
 
-               ...
-           \endquotation
+    See also \l {title-command} {\\title}.
 
-           See also \l {title}{\\title}.
-    \endtable
 */
 
 /*!
     \page 21-0-qdoc-configuration.html
-    \previouspage Title Commands
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage General Configuration Variables
-
-    \title QDoc Configuration
-
-    \tableofcontents
+    \previouspage Miscellaneous
+    \contentspage Table of Contents
+    \nextpage Generic Configuration Variables
 
-    \list
-    \o \l {Supporting Derived Projects}
-    \o \l {QDoc Compatibility}
-    \endlist
+    \title The QDoc Configuration File
 
-    When running QDoc to generate the documentation, you must specify
-    a configuration file on the command line:
+    Before running QDoc, you must create a QDoc configuration file to
+    tell QDoc where to find the source files that contain the QDoc
+    comments. The pathname to your configuration file is passed to
+    QDoc on the command line:
 
     \quotation
-        \bold {/currentdirectory$ qdoc3 my-documentation.qdocconf}
+        \c {/current/dir$ ../../bin/qdoc3 ./config.qdocconf}
     \endquotation
 
     \section1 General Description
 
-    The configuration file is a list of entries of entries of the form
-    \i {"variable = value"}. Using the configuration variables, you
-    can define where QDoc should find the various source files, images
-    and examples, where to put generated documentation etc. The
+    The configuration file is a list of entries of the form \e
+    {"variable = value"}. Using the configuration variables, you can
+    define where QDoc should find the various source files, images and
+    examples, where to put generated documentation etc. The
     configuration file can also contain directives like \c
     include. For an example, see the \l minimum.qdocconf file.
 
-    In addition, you can use some particular configuration variables
-    to make QDoc support derived projects, i.e make the projects, for
-    example Qt Solutions, contain links to the online Qt
-    documentation. These variables are documented in the \l
-    {Supporting Derived projects} section. In this section you can
-    also find out how to use these variables to support your derived
-    projects.
-
-    If some of the variable keys have the same values, they can be set
-    at the same time. For example:
-
-    \code
-    {header, source}dirs = kernel
-    \endcode
-
-    is equivalent to
-
-    \code
-    headerdirs = kernel
-    sourcedirs = kernel
-    \endcode
+    You can also use configuration variables to get QDoc to support
+    \l{Supporting Derived Projects} {derived projects}, i.e QDoc can
+    generate links in your project's documentation to elements in the
+    Qt online documentation. See the \l {Supporting Derived projects}
+    section. 
 
-    A variable's value can be set using either '=' or '+='. The
-    difference is that '=' overrides any previously set value, while
-    '+=' only adds the value to the previously set ones.
+    The value of a configuration variable can be set using either '='
+    or '+='. The difference is that '=' overrides the previous value,
+    while '+=' adds a new value to the current one.
 
-    In general, some of the variables accepts a list of strings as
-    their value, while others only accept a single string. If you
-    provide a variable of the latter type with several strings they
-    will simply be concatenated. The quotes around the value string
-    are optional. But applying them allows you to use special
-    characters like '=' and ' \" ' within the string. For example:
+    Some configuration variables accept a list of strings as their
+    value, e.g. 
+    \l {22-qdoc-configuration-generalvariables.html#sourcedirs-variable}
+    {\c{sourcedirs}}, while others accept only a single string. Double
+    quotes around a value string are optional, but including them allows 
+    you to use special characters like '=' and ' \" ' within the valuem
+    string, e.g.:
 
     \code
     HTML.postheader = "<a href=\"index.html\">Home</a>"
@@ -7037,54 +6876,46 @@
 
     \section1 Configuration Variables
 
-    \section2 Alphabetical List
-
-    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
-       {Cpp.ignoredirectives},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
-       {Cpp.ignoretokens},
-    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
-    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
-    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
-    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
-    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
-       {examples.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
-    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
-    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
-    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
-    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
-       {headers.fileextensions},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
-       {HTML.postheader},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
-    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
-    \l {22-qdoc-configuration-generalvariables.html#images}{images},
-    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
-       {images.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#language}{language},
-    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
-    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
-    \l {22-qdoc-configuration-generalvariables.html#outputformats}
-       {outputformats},
-    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
-       {outputprefixes},
-    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
-    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
-    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
-    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
-       {sources.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
-    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
-    \l {22-qdoc-configuration-generalvariables.html#version}{version},
-    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
-
-    \section2 Categories
+    \section1 Variable List
+
+    \list
+    \o \l {22-qdoc-configuration-generalvariables.html#alias-variable} {alias}
+    \o \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives-variable} {Cpp.ignoredirectives}
+    \o \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretokens-variable} {Cpp.ignoretokens}
+    \o \l {22-qdoc-configuration-generalvariables.html#defines-variable} {defines}
+    \o \l {22-qdoc-configuration-generalvariables.html#edition-variable} {edition}
+    \o \l {22-qdoc-configuration-generalvariables.html#exampledirs-variable} {exampledirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#examples-variable} {examples}
+    \o \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions-variable} {examples.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#extraimages-variable} {extraimages}
+    \o \l {22-qdoc-configuration-generalvariables.html#falsehoods-variable} {falsehoods}
+    \o \l {22-qdoc-configuration-generalvariables.html#headerdirs-variable} {headerdirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#headers-variable} {headers}
+    \o \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions-variable} {headers.fileextensions}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.footer-variable} {HTML.footer}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader-variable} {HTML.postheader}
+    \o \l {24-qdoc-configuration-htmlvariables.html#HTML.style-variable} {HTML.style}
+    \o \l {22-qdoc-configuration-generalvariables.html#imagedirs-variable} {imagedirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#images-variable} {images}
+    \o \l {22-qdoc-configuration-generalvariables.html#images.fileextensions-variable} {images.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#language-variable} {language}
+    \o \l {22-qdoc-configuration-generalvariables.html#macro-variable} {macro}
+    \o \l {22-qdoc-configuration-generalvariables.html#outputdir-variable} {outputdir}
+    \o \l {22-qdoc-configuration-generalvariables.html#outputformats-variable} {outputformats}
+    \o \l {22-qdoc-configuration-generalvariables.html#slow-variable} {slow}
+    \o \l {22-qdoc-configuration-generalvariables.html#sourcedirs-variable} {sourcedirs}
+    \o \l {22-qdoc-configuration-generalvariables.html#sources-variable} {sources}
+    \o \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions-variable} {sources.fileextensions}
+    \o \l {22-qdoc-configuration-generalvariables.html#spurious-variable} {spurious}
+    \o \l {22-qdoc-configuration-generalvariables.html#tabsize-variable} {tabsize}
+    \o \l {22-qdoc-configuration-generalvariables.html#version-variable} {version}
+    \o \l {22-qdoc-configuration-generalvariables.html#versionsym-variable} {versionsym}
+    \endlist
+
+    \section1 Categories
 
     \list
-    \o \l {General Configuration Variables}
+    \o \l {Generic Configuration Variables}
     \o \l {C++ Specific Configuration Variables}
     \o \l {HTML Specific Configuration Variables}
     \endlist
@@ -7099,8 +6930,9 @@
 
 /*!
     \page 21-1-minimum-qdocconf.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage qt.qdocconf
+    \contentspage Table of Contents
+    \nextpage Table of Contents
 
     \title minimum.qdocconf
 
@@ -7109,8 +6941,9 @@
 
 /*!
     \page 21-2-qt-qdocconf.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Compatibility Issues
+    \contentspage Table of Contents
+    \nextpage minimum.qdocconf
 
     \title qt.qdocconf
 
@@ -7119,11 +6952,11 @@
 
 /*!
     \page 22-qdoc-configuration-generalvariables.html
-    \previouspage QDoc Configuration
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage The QDoc Configuration File
+    \contentspage Table of Contents
     \nextpage Creating Help Project Files
 
-    \title General Configuration Variables
+    \title Generic Configuration Variables
 
     With the general QDoc configuration variables, you can define
     where QDoc will find the various source files it needs to generate
@@ -7131,938 +6964,877 @@
     documentation. You can also do some minor manipulation of QDoc
     itself, controlling its output and processing behavior.
 
-    \section1 Alphabetical List
-
-    \l {22-qdoc-configuration-generalvariables.html#alias}{alias},
-    \l {22-qdoc-configuration-generalvariables.html#codeindent}{codeindent},
-    \l {22-qdoc-configuration-generalvariables.html#definesvariable}{defines},
-    \l {22-qdoc-configuration-generalvariables.html#edition}{edition},
-    \l {22-qdoc-configuration-generalvariables.html#exampledirs}{exampledirs},
-    \l {22-qdoc-configuration-generalvariables.html#examples}{examples},
-    \l {22-qdoc-configuration-generalvariables.html#examples.fileextensions}
-       {examples.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#extraimages}{extraimages},
-    \l {22-qdoc-configuration-generalvariables.html#falsehoods}{falsehoods},
-    \l {22-qdoc-configuration-generalvariables.html#generateindex}{generateindex},
-    \l {22-qdoc-configuration-generalvariables.html#headerdirs}{headerdirs},
-    \l {22-qdoc-configuration-generalvariables.html#headers}{headers},
-    \l {22-qdoc-configuration-generalvariables.html#headers.fileextensions}
-       {headers.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#imagedirs}{imagedirs},
-    \l {22-qdoc-configuration-generalvariables.html#images}{images},
-    \l {22-qdoc-configuration-generalvariables.html#images.fileextensions}
-       {images.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#language}{language},
-    \l {22-qdoc-configuration-generalvariables.html#macro}{macro},
-    \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
-    \l {22-qdoc-configuration-generalvariables.html#outputformats}
-       {outputformats},
-    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
-       {outputprefixes},
-    \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
-    \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
-    \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
-    \l {22-qdoc-configuration-generalvariables.html#sources.fileextensions}
-       {sources.fileextensions},
-    \l {22-qdoc-configuration-generalvariables.html#spurious}{spurious},
-    \l {22-qdoc-configuration-generalvariables.html#tabsize}{tabsize},
-    \l {22-qdoc-configuration-generalvariables.html#tagfile}{tagfile},
-    \l {22-qdoc-configuration-generalvariables.html#version}{version},
-    \l {22-qdoc-configuration-generalvariables.html#versionsym}{versionsym}
-
-    \section1 Variable Descriptions
+    \target alias-variable
+    \section1 alias 
 
-    \table
+    The \c alias variable renames a QDoc command.
 
-    \header
-        \o Variable
-        \o Description
+    The general syntax is \tt {alias.\e{original-command-name} = \e
+    temporary-command-name}.
 
-    \row
-        \o \bold alias \target alias
-        \o \bold {The \c alias variable renames a QDoc command.}
+    \code
+        alias.i = e
+    \endcode
 
-           The general syntax is \tt {alias.\i{original-command-name}
-           = \i temporary-command-name}.
+    This renames the built-in command \\i (italics) to \\e.  The \c
+    alias variable is often used for compatibility reasons; for more
+    information see the \l {Compatibility Issues} {compatibility
+    section}.
 
-           For example:
+    See also \l {macro-command} {macro}.
 
-           \code
-           alias.i = e
-           \endcode
+    \target codeindent-variable
+    \section1 codeindent 
 
-           renames the built-in command \\i (italics) to \\e.
+    The \c codeindent variable specifies the level of indentation that
+    QDoc uses when writing code snippets.
 
-           The \c alias variable is often used for compatibility
-           reasons; for more information see the \l {QDoc
-           Compatibility}{compatibility section}.
+    QDoc originally used a hard-coded value of four spaces for code
+    indentation to ensure that code snippets could be easily
+    distinguished from surrounding text. Since we can use \l{HTML
+    Specific Configuration Variables#HTML.stylesheets} {stylesheets}
+    to adjust the appearance of certain types of HTML elements, this
+    level of indentation is not always required.
 
-           See also \l macro.
+    \target defines-variable
+    \section1 defines 
 
-    \row
-        \o \bold codeindent \target codeindent
-        \o \bold {The \c codeindent variable specifies the level of
-           indentation that QDoc uses when writing code snippets.}
+    The \c defines variable specifies the C++ preprocessor symbols
+    that QDoc will recognize and respond to.
 
-           QDoc originally used a hard-coded value of four spaces for
-           code indentation to ensure that code snippets could be easily
-           distinguished from surrounding text. Since we can use
-           \l{HTML Specific Configuration Variables#HTML.stylesheets}{stylesheets} to
-           adjust the appearance of certain types of HTML elements, this
-           level of indentation is not always required.
+    When a preprocessor symbol is specified using the \c defines
+    variable, you can also use the \l {if-command} {\\if} command to
+    enclose documentation that only will be included if the
+    preprocessor symbol is defined.
 
-    \row
-        \o \bold defines \target definesvariable
-        \o \bold {The \c defines variable specifies the C++ preprocessor
-           symbols that QDoc will recognize and respond to.}
+    The values of the variable are regular expressions (see QRegExp
+    for details). By default, no symbol is defined, meaning that code
+    protected with #ifdef...#endif will be ignored.
 
-           When a preprocessor symbol is specified using the \c
-           defines variable, you can also use the \l {if}{\\if}
-           command to enclose documentation that only will be included
-           if the preprocessor symbol is defined.
+    \code
+        defines = Q_QDOC \
+                  QT_.*_SUPPORT \
+                  QT_.*_LIB \
+                  QT_COMPAT \
+                  QT3_SUPPORT \
+                  Q_WS_.* \
+                  Q_OS_.* \
+                  Q_BYTE_ORDER \
+                  __cplusplus
+    \endcode
 
-           The values of the variable are regular expressions (see
-           QRegExp for details). By default, no symbol is defined,
-           meaning that code protected with #ifdef...#endif will be
-           ignored.
+    This ensures that QDoc will process the code that requires these
+    symbols to be defined. For example:
 
-           For example:
+    \code
+        #ifdef Q_WS_WIN
+          HDC getDC() const;
+          void releaseDC(HDC) const;
+        #endif
+    \endcode
 
-           \code
-           defines = Q_QDOC \
-                     QT_.*_SUPPORT \
-                     QT_.*_LIB \
-                     QT_COMPAT \
-                     QT3_SUPPORT \
-                     Q_WS_.* \
-                     Q_OS_.* \
-                     Q_BYTE_ORDER \
-                     __cplusplus
-           \endcode
+    Since the Q_WS_.* regular expression (specified using the \c
+    defines variable) matches Q_WS_WIN, QDoc will process the code
+    within #ifdef and #endif in our example.
 
-           ensures that QDoc will process the code that requires these
-           symbols to be defined. For example:
+    You can also define preprocessor symbols manually on the command
+    line using the -D option. For example:
 
-           \code
-           #ifdef Q_WS_WIN
-               HDC getDC() const;
-               void releaseDC(HDC) const;
-           #endif
-           \endcode
+    \code
+        currentdirectory$ qdoc3 -Dconsoleedition qt.qdocconf
+    \endcode
 
-           Since the Q_WS_.* regular expression (specified using the
-           \c defines variable) matches Q_WS_WIN, QDoc will process
-           the code within #ifdef and #endif in our example.
+    In this case the -D option ensures that the \c consoleedition
+    preprocessor symbol is defined when QDoc processes the source
+    files defined in the qt.qdocconf file.
 
-           You can also define preprocessor symbols manually on the
-           command line using the -D option. For example:
+    See also \l {falsehoods-variable} {falsehoods} and \l {if-command} {\\if}.
 
-           \code
-               currentdirectory$ qdoc3 -Dconsoleedition qt.qdocconf
-           \endcode
+    \target edition-variable
+    \section1 edition 
 
-           In this case the -D option ensures that the \c
-           consoleedition preprocessor symbol is defined when QDoc
-           processes the source files defined in the qt.qdocconf file.
+    The \c edition variable specifies which modules are included in
+    each edition of a package, and provides QDoc with information to
+    provide class lists for each edition.
 
-           See also \l falsehoods and \l {if}{\\if}.
+    This feature is mostly used when providing documentation for Qt
+    packages.
 
-    \row
-        \o \bold edition \target edition
-        \o \bold {The \c edition variable specifies which modules are
-           included in each edition of a package, and provides QDoc
-           with information to provide class lists for each edition.}
+    The \c edition variable is always used with a particular edition
+    name to define the modules for that edition:
 
-           This feature is mostly used when providing documentation
-           for Qt packages.
+    \code
+        edition.Console      = QtCore QtNetwork QtSql QtXml
+        edition.Desktop      = QtCore QtGui QtNetwork QtOpenGL QtSql QtXml \
+                               QtDesigner QtAssistant Qt3Support QAxContainer \
+                               QAxServer
+        edition.DesktopLight = QtCore QtGui Qt3SupportLight
+    \endcode
 
-           The \c edition variable is always used with a particular
-           edition name to define the modules for that edition:
+    In the above examples, the \c Console edition only includes the
+    contents of four modules. Only the classes from these modules will
+    be used when the \l{Miscellaneous#generatelist-command}
+    {generatelist} command is used to generate a list of classes for
+    this edition:
 
-           \code
-           edition.Console      = QtCore QtNetwork QtSql QtXml
-           edition.Desktop      = QtCore QtGui QtNetwork QtOpenGL QtSql QtXml \
-                                  QtDesigner QtAssistant Qt3Support QAxContainer \
-                                  QAxServer
-           edition.DesktopLight = QtCore QtGui Qt3SupportLight
-           \endcode
+    \code
+        \generatelist{classesbyedition Console}
+    \endcode
 
-           In the above examples, the \c Console edition only includes
-           the contents of four modules. Only the classes from these
-           modules will be used when the
-           \l{Miscellaneous Commands#generatelist}{generatelist} command
-           is used to generate a list of classes for this edition:
+    \target exampledirs-variable
+    \section1 exampledirs 
 
-           \code
-           \generatelist{classesbyedition Console}
-           \endcode
+    The \c exampledirs variable specifies the directories containing
+    the source code of the example files.
 
-    \row
-        \o \bold exampledirs \target exampledirs
-        \o \bold {The \c exampledirs variable specifies the directories
-           containing the source code of the example files.}
+    The \l {examples-variable} {examples} {examples} and \l
+    {exampledirs-variable} {exampledirs} variables are used by the \l
+    {quotefromfile-command} {\\quotefromfile}, \l {quotefile-command}
+    {\\quotefile} and \l {example-command} {\\example} commands.  If
+    both the \l {examples-variable} {examples} and \l
+    {exampledirs-variable} {exampledirs} variables are defined, QDoc
+    will search in both, first in \l {examples-variable} {examples}
+    then in \l {exampledirs-variable} {exampledirs}.
 
-           The \l {examples}{\c examples} and \c exampledirs variables
-           are used by the \l {quotefromfile}{\\quotefromfile}, \l
-           {quotefile}{\\quotefile} and \l {example}{\\example}
-           commands.  If both the \l {examples}{\c examples} and \c
-           exampledirs variables are defined, QDoc will search in
-           both, first in \l {examples}{\c examples} then in \c
-           exampledirs.
+    QDoc will search through the directories in the specified order,
+    and accept the first matching file it finds. It will only search
+    in the specified directories, \e not in subdirectories.
 
-           QDoc will search through the directories in the specified
-           order, and accept the first matching file it finds. It will
-           only search in the specified directories, \i not in
-           subdirectories.
+    \code
+        exampledirs = $QTDIR/doc/src \
+                      $QTDIR/examples \
+                      $QTDIR \
+                      $QTDIR/qmake/examples
 
-           For example:
+        examples    = $QTDIR/examples/widgets/analogclock/analogclock.cpp
+    \endcode
 
-           \code
-           exampledirs = $QTDIR/doc/src \
-                         $QTDIR/examples \
-                         $QTDIR \
-                         $QTDIR/qmake/examples
+    When processing
 
-           examples    = $QTDIR/examples/widgets/analogclock/analogclock.cpp
-           \endcode
+    \code
+        \quotefromfile widgets/calculator/calculator.cpp
+    \endcode
 
-           When processing
+    QDoc will then see if there exists a file called \c calculator.cpp
+    listed as a value in the \l {examples} {\c examples} variable. If
+    it doesn't, it will search in the \c exampledirs variable, and
+    first see if there exists a file called
 
-           \code
-           \quotefromfile widgets/calculator/calculator.cpp
-           \endcode
+    \code
+        $QTDIR/doc/src/widgets/calculator/calculator.cpp
+    \endcode
 
-           QDoc will then see if there exists a file called \c
-           calculator.cpp listed as a value in the \l {examples}{\c
-           examples} variable. If it doesn't, it will search in the \c
-           exampledirs variable, and first see if there exists a file
-           called
+    If it doesn't, QDoc will continue looking for a file called
 
-           \code
-           $QTDIR/doc/src/widgets/calculator/calculator.cpp
-           \endcode
+    \code
+        $QTDIR/examples/widgets/calculator/calculator.cpp
+    \endcode
 
-           If it doesn't, QDoc will continue looking for a file
-           called
+    and so forth.
 
-           \code
-           $QTDIR/examples/widgets/calculator/calculator.cpp
-           \endcode
+    See also \l examples.
 
-           and so forth.
+    \target examples-variable
+    \section1 examples 
 
-           See also \l examples.
+    The \c examples variable allows you to specify individual example
+    files in addition to those located in the directories specified by
+    the \l {exampledirs-variable} {\c exampledirs} variable.
 
-    \row
-        \o \bold examples \target examples
-        \o \bold {The \c examples variable allows you to specify individual
-           example files in addition to those located in the directories
-           specified by the \l {exampledirs}{\c exampledirs} variable.}
-
-           The \c examples and \l {exampledirs}{\c exampledirs}
-           variables are used by the \l
-           {quotefromfile}{\\quotefromfile}, \l
-           {quotefile}{\\quotefile} and \l {example}{\\example}
-           commands. If both the \c examples and \l {exampledirs}{\c
-           exampledirs} variables are defined, QDoc will search in
-           both, first in \c examples then in \l {exampledirs}{\c
-           exampledirs}.
-
-           QDoc will search through the values listed for the \c
-           examples variable, in the specified order, and accept
-           the first one it finds.
-
-           For an extensive example, see the \l {exampledirs}{\c
-           exampledirs} command. But note that if you know the file is
-           listed in the \c examples variable, you don't need to
-           specify its path:
+    The \c examples and \l {exampledirs-variable} {\c exampledirs}
+    variables are used by the \l {quotefromfile-command}
+    {\\quotefromfile}, \l {quotefile-command} {\\quotefile} and \l
+    {example} {\\example} commands. If both the \c examples and \l
+    {exampledirs-variable} {\c exampledirs} variables are defined,
+    QDoc will search in both, first in \c examples then in \l
+    {exampledirs-variable} {\c exampledirs}.
 
-           \code
-               \quotefromfile calculator.cpp
-           \endcode
+    QDoc will search through the values listed for the \c examples
+    variable, in the specified order, and accept the first one it
+    finds.
 
-           See also \l exampledirs.
+    For an extensive example, see the \l {exampledirs-variable} {\c
+    exampledirs} command. But note that if you know the file is listed
+    in the \c examples variable, you don't need to specify its path:
 
-    \row
-        \o \bold examples.fileextensions \target examples.fileextensions
-        \o \bold {The \c examples.fileextensions variable specifies the
-           file extensions that qdoc will look for when collecting example
-           files for display in the documentation.}
+    \code
+        \quotefromfile calculator.cpp
+    \endcode
 
-           The default extensions are *.cpp, *.h, *.js, *.xq, *.svg, *.xml
-           and *.ui. However, if 
+    See also \l {exampledirs-variable} {exampledirs}.
 
-           The extensions are given as standard wildcard expressions.
-           You can add a file extension to the filter using '+='. For
-           example:
+    \target examples.fileextensions-variable
+    \section1 examples.fileextensions 
 
-           \code
-           examples.fileextensions += *.qrc
-           \endcode
+    The \c examples.fileextensions variable specifies the file
+    extensions that qdoc will look for when collecting example files
+    for display in the documentation.
 
-           See also \l{headers.fileextensions}.
+    The default extensions are *.cpp, *.h, *.js, *.xq, *.svg, *.xml
+    and *.ui. However, if
 
-    \row
-        \o \bold extraimages \target extraimages
-        \o \bold {The \c extraimages variable tells QDoc to incorporate
-           specific images in the generated documentation.}
+    The extensions are given as standard wildcard expressions.  You
+    can add a file extension to the filter using '+='. For example:
 
-           QDoc will not recognize images used within HTML (or any
-           other markup language). If we want the images to be copied
-           from the directories specified by \l {imagedirs}{\c
-           imagedirs} (the images in question must be located in these
-           directories) to the output directory, we must specify the
-           images using the \c extraimages variable.
+    \code
+        examples.fileextensions += *.qrc
+    \endcode
 
-           The general syntax is \tt {extraimages.\i{format} = \i
-           image}. The file extension is optional.
+    See also \l{headers.fileextensions}.
 
-           For example, in \l qt.qdocconf we use a couple of images
-           within the HTML.postheader variable which value is pure
-           HTML. For that reason, these images are specified using the
-           \c extraimages variable:
+    \target extraimages-variable
+    \section1 extraimages 
 
-           \code
-           extraimages.HTML = qt-logo
-           \endcode
+    The \c extraimages variable tells QDoc to incorporate specific
+    images in the generated documentation.
 
-           See also \l images and \l imagedirs.
+    QDoc will not recognize images used within HTML (or any other
+    markup language). If we want the images to be copied from the
+    directories specified by \l {imagedirs} {\c imagedirs} (the images
+    in question must be located in these directories) to the output
+    directory, we must specify the images using the \c extraimages
+    variable.
 
-    \row
-        \o \bold falsehoods \target falsehoods
-        \o \bold {The \c falsehoods variable defines the truth value of
-           specified preprocessor symbols as false.}
+    The general syntax is \tt {extraimages.\e{format} = \e image}. The
+    file extension is optional.
 
-           If this variable is not set for a preprocessor symbol, QDoc
-           assumes its truth value is true. The exception is '0',
-           which value always is false.
+    For example, in \l qt.qdocconf we use a couple of images within
+    the HTML.postheader variable which value is pure HTML. For that
+    reason, these images are specified using the \c extraimages
+    variable:
 
-           QDoc will recognize, and is able to evaluate, the following
-           preprocessor syntax:
+    \code
+        extraimages.HTML = qt-logo
+    \endcode
 
-           \code
-           #ifdef NOTYET
-               ...
-           #endif
+    See also \l images and \l imagedirs.
 
-           #if defined (NOTYET)
-               ...
-           #end if
-           \endcode
+    \target falsehoods-variable
+    \section1 falsehoods 
 
-           However, faced with unknown syntax like
+    The \c falsehoods variable defines the truth value of specified
+    preprocessor symbols as false.
 
-           \code
-           #if NOTYET
-               ...
-           #endif
-           \endcode
+    If this variable is not set for a preprocessor symbol, QDoc
+    assumes its truth value is true. The exception is '0', which value
+    always is false.
 
-           QDoc will evaluate it as true by default, \i unless the
-           preprocessor symbol is specified within the \c falsehoods
-           variable entry:
+    QDoc will recognize, and is able to evaluate, the following
+    preprocessor syntax:
 
-           \code
-           falsehoods = NOTYET
-           \endcode
+    \code
+        #ifdef NOTYET
+         ...
+        #endif
 
-           See also \l defines.
+        #if defined (NOTYET)
+         ...
+        #end if
+    \endcode
 
-    \row
-        \o \bold generateindex \target generateindex
-        \o \bold{The \c generateindex variable contains a boolean value that
-           specifies whether to generate an index file when HTML documentation
-           is generated.}
-
-           By default, an index file is always generated with HTML documentation,
-           so this variable is typically only used when disabling this feature
-           (by setting the value to \c false) or when enabling index generation
-           for the WebXML output (by setting the value to \c true).
-    \row
-        \o \bold headerdirs \target headerdirs
-        \o \bold {The \c headerdirs variable specifies the directories
-           containing the header files associated with the \c .cpp source
-           files used in the documentation.}
+    However, faced with unknown syntax like
 
-           For example:
+    \code
+        #if NOTYET
+            ...
+        #endif
+    \endcode
 
-           \code
-           headerdirs = $QTDIR/src \
-                        $QTDIR/extensions/activeqt \
-                        $QTDIR/extensions/motif \
-                        $QTDIR/tools/designer/src/lib/extension \
-                        $QTDIR/tools/designer/src/lib/sdk \
-                        $QTDIR/tools/designer/src/lib/uilib
-           \endcode
+    QDoc will evaluate it as true by default, \e unless the
+    preprocessor symbol is specified within the \c falsehoods variable
+    entry:
 
-           When executed, the first QDoc will do is to read through
-           the headers specified in the \l {headers}{\c headers}
-           variable, and the ones located in the directories specified
-           in the \c headerdir variable (including all
-           subdirectories), building an internal structure of the
-           classes and their functions.
-
-           Then it will read through the sources specified in the \l
-           {sources}{\c sources}, and the ones located in the
-           directories specified in the \l {sourcedirs}{\c sourcedirs}
-           varible (including all subdirectories), merging the
-           documentation with the structure it retrieved from the
-           header files.
-
-           If both the \c headers and \c headerdirs variables are
-           defined, QDoc will read through both, first \l {headers}{\c
-           headers} then \c headerdirs.
-
-           In the specified directories, QDoc will only read the files
-           with the fileextensions specified in the \l
-           {headers.fileextensions}{\c headers.fileextensions}
-           variable. The default extensions are *.ch, *.h, *.h++,
-           *.hh, *.hpp and *.hxx". The files specified by \l
-           {headers}{\c headers} will be read independent of their
-           fileextensions.
-
-           See also \l headers and \l headers.fileextensions.
+    \code
+        falsehoods = NOTYET
+    \endcode
 
-    \row
-        \o \bold headers \target headers
-        \o \bold {The \c headers variable allows you to specify individual
-           header files in addition to those located in the directories
-           specified by the \l {headerdirs}{\c headerdirs} variable.}
+    See also \l defines.
 
-           For example:
+    \target generateindex-variable
+    \section1 generateindex 
 
-           \code
-           headers = $QTDIR/src/gui/widgets/qlineedit.h \
-                     $QTDIR/src/gui/widgets/qpushbutton.h
-           \endcode
+    The \c generateindex variable contains a boolean value that
+    specifies whether to generate an index file when HTML
+    documentation is generated.
 
-           When processing the \c headers variable, QDoc behaves in the
-           same way as it does when processing the \l {headerdirs}{\c
-           headerdirs} variable. For more information, see the \l
-           {headerdirs}{\c headerdirs} variable.
+    By default, an index file is always generated with HTML
+    documentation, so this variable is typically only used when
+    disabling this feature (by setting the value to \c false) or when
+    enabling index generation for the WebXML output (by setting the
+    value to \c true).
 
-           See also \l headerdirs.
+    \target headerdirs-variable
+    \section1 headerdirs 
 
-    \row
-        \o \bold headers.fileextensions \target headers.fileextensions
-        \o \bold {The \c headers.fileextensions variable specify the
-           extension used by the headers.}
+    The \c headerdirs variable specifies the directories containing
+    the header files associated with the \c .cpp source files used in
+    the documentation.
 
-           When processing the header files specified in the \l
-           {headerdirs}{\c headerdirs} variable, QDoc will only read
-           the files with the fileextensions specified in the \c
-           headers.fileextensions variable. In this way QDoc avoid
-           spending time reading irrelevant files.
+    \code
+        headerdirs = $QTDIR/src \
+                     $QTDIR/extensions/activeqt \
+                     $QTDIR/extensions/motif \
+                     $QTDIR/tools/designer/src/lib/extension \
+                     $QTDIR/tools/designer/src/lib/sdk \
+                     $QTDIR/tools/designer/src/lib/uilib
+    \endcode
 
-           The default extensions are *.ch, *.h, *.h++, *.hh, *.hpp
-           and *.hxx.
+    When executed, the first QDoc will do is to read through the
+    headers specified in the \l {headers} {\c headers} variable, and
+    the ones located in the directories specified in the \c headerdir
+    variable (including all subdirectories), building an internal
+    structure of the classes and their functions.
 
-           The extensions are given as standard wildcard expressions.
-           You can add a file extension to the filter using '+='. For
-           example:
+    Then it will read through the sources specified in the \l
+    {sources-variable} {\c sources}, and the ones located in the
+    directories specified in the \l {sourcedirs-variable} {\c
+    sourcedirs} varible (including all subdirectories), merging the
+    documentation with the structure it retrieved from the header
+    files.
 
-           \code
-           header.fileextensions += *.H
-           \endcode
+    If both the \c headers and \c headerdirs variables are defined,
+    QDoc will read through both, first \l {headers} {\c headers} then
+    \c headerdirs.
 
-           \warning The above assignment may not work as described.
+    In the specified directories, QDoc will only read the files with
+    the fileextensions specified in the \l {headers.fileextensions}
+    {\c headers.fileextensions} variable. The default extensions are
+    *.ch, *.h, *.h++, *.hh, *.hpp and *.hxx". The files specified by
+    \l {headers} {\c headers} will be read independent of their
+    fileextensions.
 
-           See also \l headerdirs.
+    See also \l headers and \l headers.fileextensions.
 
-    \row
-        \o \bold imagedirs \target imagedirs
-        \o \bold {The \c imagedirs variable specifies the directories
-           containing the images used in the documentation.}
+    \target headers-variable
+    \section1 headers 
 
-           The \l {images}{\c images} and \c imagedirs variables are
-           used by the \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage} commands.  If both the \l
-           {images}{\c images} and \c imagedirs variables are defined,
-           QDoc will search in both, first in \l {images}{\c images}
-           then in \c imagedirs.
+    The \c headers variable allows you to specify individual header
+    files in addition to those located in the directories specified by
+    the \l {headerdirs} {\c headerdirs} variable.
 
-           QDoc will search through the directories in the specified
-           order, and accept the first matching file it finds. It will
-           only search in the specified directories, \i not in
-           subdirectories.
+    \code
+        headers = $QTDIR/src/gui/widgets/qlineedit.h \
+                  $QTDIR/src/gui/widgets/qpushbutton.h
+    \endcode
 
-           For example:
+    When processing the \c headers variable, QDoc behaves in the same
+    way as it does when processing the \l {headerdirs} {\c headerdirs}
+    variable. For more information, see the \l {headerdirs} {\c
+    headerdirs} variable.
 
-           \code
-           imagedirs = $QTDIR/doc/src/images \
-                       $QTDIR/examples
+    See also \l headerdirs.
 
-           images    = $QTDIR/doc/src/images/calculator-example.png
-           \endcode
+    \target headers.fileextensions-variable
+    \section1 headers.fileextensions 
 
-           When processing
+    The \c headers.fileextensions variable specify the extension used
+    by the headers.
 
-           \code
-               \image calculator-example.png
-           \endcode
+    When processing the header files specified in the \l {headerdirs}
+    {\c headerdirs} variable, QDoc will only read the files with the
+    fileextensions specified in the \c headers.fileextensions
+    variable. In this way QDoc avoid spending time reading irrelevant
+    files.
 
-           QDoc will then see if there exists a file called
-           calculator-example.png listed as a value in the \c images
-           variable. If it doesn't, it will search in the \c imagedirs
-           variable, and first see if there exists a file called
+    The default extensions are *.ch, *.h, *.h++, *.hh, *.hpp and
+    *.hxx.
 
-           \code
-               $QTDIR/doc/src/images/calculator-example.png
-           \endcode
+    The extensions are given as standard wildcard expressions.  You
+    can add a file extension to the filter using '+='. For example:
 
-           If it doesn't, QDoc will look for a file called
+    \code
+        header.fileextensions += *.H
+    \endcode
 
-           \code
-               $QTDIR/examples/calculator-example.png
-           \endcode
+    \warning The above assignment may not work as described.
 
-           You can filter the images in an image directory using the
-           \l {images.fileextensions}{\c images.fileextensions}
-           variable.  The general idea behind the \l
-           {images.fileextensions}{\c images.fileextensions} variable
-           is to enable different image format for different output
-           format.
+    See also \l headerdirs.
 
-           \warning The \l {images.fileextensions}{\c
-           images.fileextensions} variable's functionality is
-           preliminay since QDoc at this point only support HTML.
+    \target imagedirs-variable
+    \section1 imagedirs 
 
-           See also \l images and \l images.fileextensions.
+    The \c imagedirs variable specifies the directories containing the
+    images used in the documentation.
 
-    \row
-        \o \bold images \target images
-        \o \bold {The \c images variable allows you to specify individual
-           image files in addition to those located in the directories
-           specified by the \l {imagedirs}{\c imagedirs} variable.}
+    The \l {images} {\c images} and \c imagedirs variables are used by
+    the \l {image-command} {\\image} and \l {inlineimage-command}
+    {\\inlineimage} commands.  If both the \l {images} {\c images} and
+    \c imagedirs variables are defined, QDoc will search in both,
+    first in \l {images} {\c images} then in \c imagedirs.
 
-           For example:
+    QDoc will search through the directories in the specified order,
+    and accept the first matching file it finds. It will only search
+    in the specified directories, \e not in subdirectories.
 
-           \code
-               images = $QTDIR/doc/src/images/calculator-example.png
-           \endcode
+    \code
+        imagedirs = $QTDIR/doc/src/images \
+                    $QTDIR/examples
 
-           When processing the \c images variable, QDoc behaves in the
-           same way as it does when processing the \l {imagedirs}{\c
-           imagedirs} variable. For more information, see the \l
-           {imagedirs}{\c imagedirs} variable.
+        images    = $QTDIR/doc/src/images/calculator-example.png
+    \endcode
 
-           See also \l imagedirs and \l images.fileextensions.
+    When processing
 
-    \row
-        \o \bold images.fileextensions \target images.fileextensions
-        \o \bold {The images.fileextensions variable filters the files within
-           an image directory.}
+    \code
+        \image calculator-example.png
+    \endcode
 
-           The variable's values (the extensions) are given as
-           standard wildcard expressions.  The general syntax is: \tt
-           {images.fileextensions.\i{format} = *.\i{extension}}.
+    QDoc will then see if there exists a file called
+    calculator-example.png listed as a value in the \c images
+    variable. If it doesn't, it will search in the \c imagedirs
+    variable, and first see if there exists a file called
 
-           The idea is to enable different image format for different
-           output format. For example:
+    \code
+        $QTDIR/doc/src/images/calculator-example.png
+    \endcode
 
-           \code
-               images.fileextensions.HTML = *.png
-               images.fileextensions.LOUT = *.eps
-           \endcode
+    If it doesn't, QDoc will look for a file called
 
-           Then, when processing the \l {image}{\\image} and \l
-           {inlineimage}{\\inlineimage} commands, QDoc will only
-           search for files with extensions specified in the output
-           format's associated image extension variable.
+    \code
+        $QTDIR/examples/calculator-example.png
+    \endcode
 
-           \warning This is preliminary functionality since QDoc at
-           this point only support HTML.
+    You can filter the images in an image directory using the \l
+    {images.fileextensions} {\c images.fileextensions} variable.  The
+    general idea behind the \l {images.fileextensions} {\c images.fileextensions} 
+    variable is to enable different image format for different output format.
 
-           The default extensions for HTML are *.png, *.jpg, *.jpeg
-           and *.gif.
+    \warning The \l {images.fileextensions} {\c images.fileextensions}
+    variable's functionality is preliminay since QDoc at this point
+    only support HTML.
 
-           You can add a file extension to the filter using '+='. For
-           example:
+    See also \l images and \l images.fileextensions.
 
-           \code
-               images.fileextensions.HTML += *.eps
-           \endcode
+    \target images-variable
+    \section1 images 
 
-           See also \l imagedirs and \l images.
+    The \c images variable allows you to specify individual image
+    files in addition to those located in the directories specified by
+    the \l {imagedirs} {\c imagedirs} variable.
 
-    \row
-        \o \bold language \target language
-        \o \bold {The \c language variable specifies the language of the
-           source code that is used in the documentation.}
+    \code
+        images = $QTDIR/doc/src/images/calculator-example.png
+    \endcode
 
-           Currently, C++ is the only language that QDoc
-           understands. It is also the default language, and doesn't
-           really need to be specified. But for example in \l
-           qt.qdocconf:
+    When processing the \c images variable, QDoc behaves in the same
+    way as it does when processing the \l {imagedirs} {\c imagedirs}
+    variable. For more information, see the \l {imagedirs} {\c
+    imagedirs} variable.
 
-           \code
-           language = Cpp
-           \endcode
+    See also \l imagedirs and \l images.fileextensions.
 
-           identifies the language of the Qt source code as C++.
+    \target images.fileextensions-variable
+    \section1 images.fileextensions 
 
-    \row
-        \o \bold macro \target macro
-        \o \bold {The \c macro variable can be used to create your
-           own QDoc commands.}
+    The images.fileextensions variable filters the files within an
+    image directory.
 
-           The general syntax is \tt {macro.\i{command} =
-           "\i{definition}}". The definition can be described using
-           QDoc syntax. In addition it is possible to provide an HTML
-           definition by appending .HTML to the variable.
+    The variable's values (the extensions) are given as standard
+    wildcard expressions.  The general syntax is: \tt
+    {images.fileextensions.\e{format} = *.\e{extension}}.
 
-           For example in \l qt.qdocconf:
+    The idea is to enable different image format for different output
+    format.
 
-           \code
-           macro.gui              = "\\bold"
-           macro.raisedaster.HTML = "<sup>*</sup>"
-           \endcode
+    \code
+        images.fileextensions.HTML = *.png
+        images.fileextensions.LOUT = *.eps
+    \endcode
 
-           makes sure that the \\gui command renders its argument using a
-           bold font, and that \\raisedaster renders a '*'.
+    Then, when processing the \l {image-command} {\\image} and \l
+    {inlineimage-command} {\\inlineimage} commands, QDoc will only
+    search for files with extensions specified in the output format's
+    associated image extension variable.
 
-    \row
-        \o \bold naturallanguage \target naturallanguage
-        \o \bold {The \c naturallanguage variable specifies the natural
-           language used for the documentation generated by qdoc.}
+    \warning This is preliminary functionality since QDoc at this
+    point only support HTML.
 
-           For example:
+    The default extensions for HTML are *.png, *.jpg, *.jpeg and
+    *.gif.
 
-           \code
-           naturallanguage = zh-Hans
-           \endcode
+    You can add a file extension to the filter using '+='. For
+    example:
 
-           By default, the natural language is \c en for compatibility
-           with legacy documentation.
+    \code
+        images.fileextensions.HTML += *.eps
+    \endcode
 
-           qdoc will add the natural language information to the HTML
-           it generates, using the \c lang and \c xml:lang attributes.
+    See also \l imagedirs and \l images.
 
-           See also \l sourceencoding, \l outputencoding,
-           \l{http://www.w3.org/TR/xhtml1/#C_7}{C.7. The lang and xml:lang Attributes} and
-           \l{http://www.w3.org/TR/i18n-html-tech-lang/#ri20040429.113217290}{Best Practice 13: Using Hans and Hant codes}.
+    \target language-variable
+    \section1 language 
 
-    \row
-        \o \bold outputdir \target outputdir
-        \o \bold {The \c outputdir variable specifies the directory
-           where QDoc will put the generated documentation.}
+    The \c language variable specifies the language of the source code
+    that is used in the documentation.
 
-           In qt.qdocconf:
+    Currently, C++ is the only language that QDoc understands. It is
+    also the default language, and doesn't really need to be
+    specified. But for example in \l qt.qdocconf:
 
-           \code
-           outputdir = $QTDIR/doc/html
-           \endcode
+    \code
+        language = Cpp
+    \endcode
 
-           locates the generated Qt reference documentation in
-           $QTDIR/doc/html. For example, the documentation of the
-           QWidget class is located in
+    identifies the language of the Qt source code as C++.
 
-           \code
-           $QTDIR/doc/html/qwidget.html
-           \endcode
+    \target macro-variable
+    \section1 macro 
 
-           The associated images will be put in an \c images subdirectory.
+    The \c macro variable can be used to create your own QDoc
+    commands.
 
-           \warning When running QDoc multiple times using the same output
-           directory, all files from the previous run will be lost.
+    The general syntax is \tt {macro.\e{command} =
+    "\e{definition}}". The definition can be described using QDoc
+    syntax. In addition it is possible to provide an HTML definition
+    by appending .HTML to the variable.
 
-    \row
-        \o \bold outputencoding \target outputencoding
-        \o \bold {The \c outputencoding variable specifies the encoding
-           used for the documentation generated by qdoc.}
+    For example in \l qt.qdocconf:
 
-           For example:
+    \code
+        macro.gui              = "\\bold"
+        macro.raisedaster.HTML = "<sup>*</sup>"
+    \endcode
 
-           \code
-           outputencoding = UTF-8
-           \endcode
+    makes sure that the \\gui command renders its argument using a
+    bold font, and that \\raisedaster renders a '*'.
 
-           By default, the output encoding is \c ISO-8859-1 (Latin1) for
-           compatibility with legacy documentation. When generating
-           documentation for some languages, particularly non-European
-           languages, this is not sufficient and an encoding such as UTF-8
-           is required.
+    \target naturallanguage-variable
+    \section1 naturallanguage 
 
-           qdoc will encode HTML using this encoding and generate the
-           correct declarations to indicate to browsers which encoding
-           is being used. The \l naturallanguage configuration variable
-           should also be specified to provide browsers with a complete
-           set of character encoding and language information.
+    The \c naturallanguage variable specifies the natural language
+    used for the documentation generated by qdoc.
 
-           See also \l outputencoding and \l naturallanguage.
+    \code
+        naturallanguage = zh-Hans
+    \endcode
 
-    \row
-        \o \bold outputformats \target outputformats
-        \o \bold {The \c outputformats variable specifies the format of
-           the generated documentation.}
+    By default, the natural language is \c en for compatibility with
+    legacy documentation.
 
-           Currently, QDoc only supports the HTML format. It is also
-           the default format, and doesn't need to be specified.
+    qdoc will add the natural language information to the HTML it
+    generates, using the \c lang and \c xml:lang attributes.
 
-    \row
-        \o \bold outputprefixes \target outputprefixes
-        \o \bold {The \c outputprefixes variable specifies a mapping between
-           types of files and the prefixes to prepend to the HTML file names
-           in the generated documentation.}
+    See also \l {sourceencoding-variable} {sourceencoding}, 
+    \l {outputencoding-variable} {outputencoding},
+    \l{http://www.w3.org/TR/xhtml1/#C_7} 
+    {C.7. The lang and xml:lang Attributes} and
+    \l{http://www.w3.org/TR/i18n-html-tech-lang/#ri20040429.113217290}
+    {Best Practice 13: Using Hans and Hant codes}.
 
-           For example:
+    \target outputdir-variable
+    \section1 outputdir 
 
-           \code
-           outputprefixes = QML
-           outputprefixes.QML = qt-components-
-           \endcode
+    The \c outputdir variable specifies the directory where QDoc will
+    put the generated documentation.
 
-           Be default, files containing the API documentation for QML elements
-           or components are prefixed with "qml-". In the above example, the
-           prefix "qt-components-" is used instead.
+    In qt.qdocconf:
 
-    \row
-        \o \bold qhp \target qhp
-        \o \bold{The \c qhp variable is used to define the information to be
-           written out to Qt Help Project (\c{qhp}) files.}
+    \code
+        outputdir = $QTDIR/doc/html
+    \endcode
 
-           See the \l{Creating Help Project Files} chapter for information
-           about this process.
+    locates the generated Qt reference documentation in
+    $QTDIR/doc/html. For example, the documentation of the QWidget
+    class is located in
 
-    \row
-        \o \bold slow (removed) \target slow
-        \o \bold {The \c slow variable previously specified whether QDoc should
-           do time-consuming processing, such as syntax highlighting.}
+    \code
+        $QTDIR/doc/html/qwidget.html
+    \endcode
 
-           This option has been replaced by the \l{syntaxhighlighing} option.
+    The associated images will be put in an \c images subdirectory.
 
-           For compatibility, the \c -slow command-line option has been
-           retained. This has the effect of enabling syntax highlighting.
+    \warning When running QDoc multiple times using the same output
+    directory, all files from the previous run will be lost.
 
-    \row
-        \o \bold sourcedirs \target sourcedirs
-        \o \bold {The \c sourcedirs variable specifies the directories
-           containing the \c .cpp or \c .qdoc files used in
-           the documentation.}
+    \target outputencoding-variable
+    \section1 outputencoding 
 
-           For example in \l qt.qdocconf
+    The \c outputencoding variable specifies the encoding used for the
+    documentation generated by qdoc.
 
-           \code
-           sourcedirs = $QTDIR/src \
-                        $QTDIR/doc/src \
-                        $QTDIR/extensions/activeqt \
-                        $QTDIR/extensions/motif \
-                        $QTDIR/tools/designer/src/lib/extension \
-                        $QTDIR/tools/designer/src/lib/sdk \
-                        $QTDIR/tools/designer/src/lib/uilib
-           \endcode
+    \code
+        outputencoding = UTF-8
+    \endcode
 
-           When executed, the first QDoc will do is to read through
-           the headers specified in the \l {header}{\c header}
-           variable, and the ones located in the directories specified
-           in the \c headerdir variable (including all
-           subdirectories), building an internal structure of the
-           classes and their functions.
-
-           Then it will read through the sources specified in the \l
-           {sources}{\c sources}, and the ones located in the
-           directories specified in the \l {sourcedirs}{\c sourcedirs}
-           varible (including all subdirectories), merging the
-           documentation with the structure it retrieved from the
-           header files.
-
-           If both the \c sources and \c sourcedirs variables are
-           defined, QDoc will read through both, first \l {sources}{\c
-           sources} then \c sourcedirs.
-
-           In the specified directories, QDoc will only read the files
-           with the fileextensions specified in the \l
-           {sources.fileextensions}{\c sources.fileextensions}
-           variable. The default extensions are *.c++, *.cc, *.cpp and
-           *.cxx. The files specified by \l {sources}{\c sources} will
-           be read independent of their fileextensions.
-
-           See also \l sources and \l sources.fileextensions.
+    By default, the output encoding is \c ISO-8859-1 (Latin1) for
+    compatibility with legacy documentation. When generating
+    documentation for some languages, particularly non-European
+    languages, this is not sufficient and an encoding such as UTF-8 is
+    required.
 
-    \row
-        \o \bold sourceencoding \target sourceencoding
-        \o \bold {The \c sourceencoding variable specifies the encoding
-           used for the source code and documentation.}
+    qdoc will encode HTML using this encoding and generate the correct
+    declarations to indicate to browsers which encoding is being
+    used. The \l naturallanguage configuration variable should also be
+    specified to provide browsers with a complete set of character
+    encoding and language information.
 
-           For example:
+    See also \l outputencoding and \l naturallanguage.
 
-           \code
-           sourceencoding = UTF-8
-           \endcode
+    \target outputformats-variable
+    \section1 outputformats 
 
-           By default, the source encoding is \c ISO-8859-1 (Latin1) for
-           compatibility with legacy documentation. For some languages,
-           particularly non-European languages, this is not sufficient
-           and an encoding such as UTF-8 is required.
+    The \c outputformats variable specifies the format of
+    the generated documentation.
 
-           Although qdoc will use the encoding to read source and
-           documentation files, limitations of C++ compilers may prevent
-           you from using non-ASCII characters in source code comments.
-           In cases like these, it is possible to write API documentation
-           completely in documentation files.
+    Currently, QDoc only supports the HTML format. It is also
+    the default format, and doesn't need to be specified.
 
-           See also \l naturallanguage and \l outputencoding.
+    \target outputprefixes
+    \section1 outputprefixes
 
-    \row
-        \o \bold sources \target sources
-        \o \bold {The \c sources variable allows you to specify
-           individual source files in addition to those located in the
-           directories specified by the \l {sourcedir}{\c sourcedir}
-           variable.}
+    The \c outputprefixes variable specifies a mapping between types of files
+    and the prefixes to prepend to the HTML file names in the generated
+    documentation.
 
-           For example:
+    \code
+        outputprefixes = QML
+        outputprefixes.QML = qt-components-
+    \endcode
 
-           \code
-           sources = $QTDIR/src/gui/widgets/qlineedit.cpp \
-                     $QTDIR/src/gui/widgets/qpushbutton.cpp
-           \endcode
+    By default, files containing the API documentation for QML elements
+    or components are prefixed with "qml-". In the above example, the
+    prefix "qt-components-" is used instead.
 
-           When processing the \c sources variable, QDoc behaves in the
-           same way as it does when processing the \l {sourcedirs}{\c
-           sourcedirs} variable. For more information, see the \l
-           {sourcedirs}{\c sourcedirs} variable.
+    \target qhp-variable
+    \section1 qhp 
 
-           See also \l sourcedirs.
+    The \c qhp variable is used to define the information to be
+    written out to Qt Help Project (\c{qhp}) files.
 
-    \row
-        \o \bold sources.fileextensions \target sources.fileextensions
-        \o \bold {The \c sources.fileextensions variable filters the
-           files within a source directory.}
+    See the \l{Creating Help Project Files} chapter for information
+    about this process.
 
-           When processing the source files specified in the \l
-           {sourcedirs}{\c sourcedirs} variable, QDoc will only read
-           the files with the fileextensions specified in the \c
-           sources.fileextensions variable. In this way QDoc avoid
-           spending time reading irrelevant files.
 
-           The default extensions are *.c++, *.cc, *.cpp and *.cxx.
+    \target slow-variable
+    \section1 slow 
 
-           The extensions are given as standard wildcard expressions.
-           You can add a file extension to the filter using '+='. For
-           example:
+    The \c slow variable specifies whether QDoc should do
+    time-consuming processing, such as syntax highlighting.  The
+    default value is false.
 
-           \code
-           sources.fileextensions += *.CC
-           \endcode
+    \note This option has been replaced by the \l{syntaxhighlighting} option.
 
-           \warning The above assignment may not work as described.
+    For compatibility, the \c -slow command-line option has been
+    retained. This has the effect of enabling syntax highlighting.
 
-           See also \l sourcedirs and \l sources.
+    \target sourcedirs-variable
+    \section1 sourcedirs 
 
-    \row
-        \o \bold spurious \target spurious
-        \o \bold {The \c spurious variable excludes specified
-           QDoc warnings from the output.}
+    The \c sourcedirs variable specifies the directories containing
+    the \c .cpp or \c .qdoc files used in the documentation.
 
-           The warnings are specified using standard wildcard
-           expressions. For example:
+    For example in \l qt.qdocconf
 
-           \code
-           spurious = "Cannot find .*" \
-                      "Missing .*"
-           \endcode
+    \code
+        sourcedirs = $QTDIR/src \
+                     $QTDIR/doc/src \
+                     $QTDIR/extensions/activeqt \
+                     $QTDIR/extensions/motif \
+                     $QTDIR/tools/designer/src/lib/extension \
+                     $QTDIR/tools/designer/src/lib/sdk \
+                     $QTDIR/tools/designer/src/lib/uilib
+    \endcode
 
-           makes sure that warnings matching either of these
-           expressions, will not be part of the output when running
-           QDoc. For example would the following warning be omitted
-           from the output:
+    When executed, the first QDoc will do is to read through the
+    headers specified in the \l {header-command} {\c header} variable,
+    and the ones located in the directories specified in the \c
+    headerdir variable (including all subdirectories), building an
+    internal structure of the classes and their functions.
 
-           \code
-           qt-4.0/src/opengl/qgl_mac.cpp:156: Missing parameter name
-           \endcode
+    Then it will read through the sources specified in the \l
+    {sources} {\c sources}, and the ones located in the directories
+    specified in the \l {sourcedirs} {\c sourcedirs} varible
+    (including all subdirectories), merging the documentation with the
+    structure it retrieved from the header files.
 
-    \row
-        \o \bold syntaxhighlighting \target syntaxhighlighting
-        \o \bold{The \c syntaxhighlighting variable specifies whether QDoc
-           should perform syntax highlighting on source code quoted in the
-           documentation it output.}
+    If both the \c sources and \c sourcedirs variables are defined,
+    QDoc will read through both, first \l {sources} {\c sources} then
+    \c sourcedirs.
 
-           For example:
+    In the specified directories, QDoc will only read the files with
+    the fileextensions specified in the \l {sources.fileextensions}
+    {\c sources.fileextensions} variable. The default extensions are
+    *.c++, *.cc, *.cpp and *.cxx. The files specified by \l {sources}
+    {\c sources} will be read independent of their fileextensions.
 
-           \code
-           syntaxhighlighting = true
-           \endcode
+    See also \l {sources-variable} {sources} and 
+    \l {sources.fileextensions-variable} {sources.fileextensions}.
 
-           will enable syntax highlighting for all supported programming
-           languages.
+    \target sourceencoding-variable
+    \section1 sourceencoding 
 
-    \row
-        \o \bold tabsize \target tabsize
-        \o \bold {The \c tabsize variable defines the size of a tab
-           character.}
+    The \c sourceencoding variable specifies the encoding used for the
+    source code and documentation.
 
-           For example:
+    \code
+        sourceencoding = UTF-8
+    \endcode
 
-           \code
-           tabsize = 4
-           \endcode
+    By default, the source encoding is \c ISO-8859-1 (Latin1) for
+    compatibility with legacy documentation. For some languages,
+    particularly non-European languages, this is not sufficient and an
+    encoding such as UTF-8 is required.
 
-           will give the tab character the size of 4 spaces.
+    Although qdoc will use the encoding to read source and
+    documentation files, limitations of C++ compilers may prevent you
+    from using non-ASCII characters in source code comments.  In cases
+    like these, it is possible to write API documentation completely
+    in documentation files.
 
-           The default value of the variable is 8, and doesn't need to
-           be specified.
+    See also \l {naturallanguage-variable} {naturallanguage} and 
+    \l {outputencoding-variable} {outputencoding}.
 
-    \row
-        \o \bold tagfile \target tagfile
-        \o \bold{The \c tagfile variable specifies the Doxygen tag file to be written
-           when HTML is generated.}
-    \row
-        \o \bold version \target version
-        \o \bold {The \c version variable specifies the version number of the
-           documented software.}
+    \target sources-variable
+    \section1 sources 
 
-           For example:
+    The \c sources variable allows you to specify individual source
+    files in addition to those located in the directories specified by
+    the \l {sourcedirs-variable} {sourcedirs} variable.
 
-           \code
-           version = 4.0.1
-           \endcode
+    \code
+        sources = $QTDIR/src/gui/widgets/qlineedit.cpp \
+                  $QTDIR/src/gui/widgets/qpushbutton.cpp
+    \endcode
 
-           When a version number is specified (using the \tt{\l
-           version} or \tt {\l versionsym} variables in a \c .qdocconf
-           file), it is accessible through the corresponding \\version
-           command for use in the documentation.
+    When processing the \c sources variable, QDoc behaves in the same
+    way as it does when processing the \l {sourcedirs-variable}
+    {sourcedirs} variable. For more information, see the \l
+    {sourcedirs-variable} {sourcedirs} variable.
 
-           \warning The \\version command's functionality is not
-           fully implemented; currently it only works within raw HTML
-           code.
+    See also \l {sourcedirs-variable} {sourcedirs}.
 
-           See also \l versionsym.
+    \target sources.fileextensions-variable
+    \section1 sources.fileextensions 
 
-    \row
-        \o \bold versionsym \target versionsym
-        \o \bold {The \c versionsym variable specifies a C++
-           preprocessor symbol that defines the version number
-           of the documented software.}
+    The \c sources.fileextensions variable filters the files within a
+    source directory.
 
-           For example in \l qt.qdocconf:
+    When processing the source files specified in the \l {sourcedirs}
+    {\c sourcedirs} variable, QDoc will only read the files with the
+    fileextensions specified in the \c sources.fileextensions
+    variable. In this way QDoc avoid spending time reading irrelevant
+    files.
 
-           \code
-           versionsym = QT_VERSION_STR
-           \endcode
+    The default extensions are *.c++, *.cc, *.cpp and *.cxx.
 
-           QT_VERSION_STR is defined in qglobal.h as follows
+    The extensions are given as standard wildcard expressions.  You
+    can add a file extension to the filter using '+='. For example:
 
-           \code
-           #define QT_VERSION_STR   "4.0.1"
-           \endcode
+    \code
+        sources.fileextensions += *.CC
+    \endcode
 
-           When a version number is specified (using the \tt{\l
-           version} or \tt {\l versionsym} variables in a \c .qdocconf
-           file), it is accessible through the corresponding \\version
-           command for use in the documentation.
+    \warning The above assignment may not work as described.
 
-           \warning The \\version command's functionality is not fully
-           implemented; currently it only works within raw HTML code.
+    See also \l {sourcedirs-variable} {sourcedirs} and \l
+    (sources-variable} {sources}.
 
-           See also \l {version}{\\version}.
 
-    \endtable
+    \target spurious-variable
+    \section1 spurious 
+
+    The \c spurious variable excludes specified QDoc warnings from the
+    output.  The warnings are specified using standard wildcard
+    expressions.
+
+    \code
+        spurious = "Cannot find .*" \
+        "Missing .*"
+    \endcode
+
+    makes sure that warnings matching either of these expressions,
+    will not be part of the output when running QDoc. For example
+    would the following warning be omitted from the output:
+
+    \code
+        qt-4.0/src/opengl/qgl_mac.cpp:156: Missing parameter name
+    \endcode
+
+    \target syntaxhighlighting
+    \section1 syntaxhighlighting
+
+    The \c syntaxhighlighting variable specifies whether QDoc should
+    perform syntax highlighting on source code quoted in the
+    documentation it generates.
+
+    \code
+        syntaxhighlighting = true
+    \endcode
+
+    will enable syntax highlighting for all supported programming
+    languages.
+
+    \target tabsize-variable
+    \section1 tabsize 
+
+    The \c tabsize variable defines the size of a tab character.
+
+    \code
+    tabsize = 4
+    \endcode
+
+    will give the tab character the size of 4 spaces.  The default
+    value of the variable is 8, and doesn't need to be specified.
+
+    \target tagfile-variable
+    \section1 tagfile 
+ 
+    The \c tagfile variable specifies the Doxygen tag file to be
+    written when HTML is generated.
+
+    \target version-variable
+    \section1 version 
+
+    The \c version variable specifies the version number of the
+    documented software.
+
+    \code
+        version = 4.0.1
+    \endcode
+
+    When a version number is specified (using the \tt{\l version} or
+    \tt {\l versionsym} variables in a \c .qdocconf file), it is
+    accessible through the corresponding \\version command for use in
+    the documentation.
+
+    \warning The \\version command's functionality is not fully
+    implemented; currently it only works within raw HTML code.
+
+    See also \l versionsym.
+
+    \target versionsym-variable
+    \section1 versionsym 
+
+    The \c versionsym variable specifies a C++ preprocessor symbol
+    that defines the version number of the documented software.
+
+    For example in \l qt.qdocconf:
+
+    \code
+        versionsym = QT_VERSION_STR
+    \endcode
+
+    QT_VERSION_STR is defined in qglobal.h as follows
+
+    \code
+        #define QT_VERSION_STR   "4.0.1"
+    \endcode
+
+    When a version number is specified (using the \tt{\l version} or
+    \tt {\l versionsym} variables in a \c .qdocconf file), it is
+    accessible through the corresponding \\version command for use in
+    the documentation.
+
+    \warning The \\version command's functionality is not fully
+    implemented; currently it only works within raw HTML code.
+
+    See also \l {version} {\\version}.
 */
 
 /*!
     \page 22-creating-help-project-files.html
-    \previouspage General Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Generic Configuration Variables
+    \contentspage Table of Contents
     \nextpage C++ Specific Configuration Variables
 
     \title Creating Help Project Files
@@ -8131,7 +7903,7 @@
 /*!
     \page 23-qdoc-configuration-cppvariables.html
     \previouspage Creating Help Project Files
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage HTML Specific Configuration Variables
 
     \title C++ Specific Configuration Variables
@@ -8139,137 +7911,114 @@
     The C++ specific configuration variables are provided to avoid
     erroneous documentation due to non-standard C++ constructs.
 
-    \section1 Alphabetical List
-
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoredirectives}
-       {Cpp.ignoredirectives},
-    \l {23-qdoc-configuration-cppvariables.html#Cpp.ignoretoken}
-       {Cpp.ignoretokens}
-
-    \section1 Variable Descriptions
+    \target Cpp.ignoredirectives-variable
+    \section1  Cpp.ignoredirectives 
 
-    \table
-
-    \header
-        \o Variable
-        \o Description
+    The \c Cpp.ignoredirectives variable makes QDoc ignore the
+    specified non-standard constructs, within C++ source code.
 
-    \row
-        \o \bold  Cpp.ignoredirectives \target Cpp.ignoredirectives
-        \o \bold {The \c Cpp.ignoredirectives variable makes QDoc ignore
-           the specified non-standard constructs, within C++ source code.}
+    If not specified by the \tt {\l Cpp.ignoretokens} or \tt {\l
+    Cpp.ignoredirectives} variables, non-standard constructs
+    (typically macros) can result in erroneous documentation.
 
-           If not specified by the \tt {\l Cpp.ignoretokens} or \tt
-           {\l Cpp.ignoredirectives} variables, non-standard
-           constructs (typically macros) can result in erroneous
-           documentation.
+    In \l qt.qdocconf:
 
-           In \l qt.qdocconf:
+    \code
+    Cpp.ignoredirectives = Q_DECLARE_INTERFACE \
+                           Q_DECLARE_OPERATORS_FOR_FLAGS \
+                           Q_DECLARE_PRIVATE \
+                           Q_DECLARE_PUBLIC \
+                           Q_DISABLE_COPY \
+                           Q_DUMMY_COMPARISON_OPERATOR \
+                           Q_ENUMS \
+                           Q_FLAGS \
+                           Q_INTERFACES \
+                           __attribute__
+    \endcode
 
-           \code
-           Cpp.ignoredirectives = Q_DECLARE_INTERFACE \
-                                  Q_DECLARE_OPERATORS_FOR_FLAGS \
-                                  Q_DECLARE_PRIVATE \
-                                  Q_DECLARE_PUBLIC \
-                                  Q_DISABLE_COPY \
-                                  Q_DUMMY_COMPARISON_OPERATOR \
-                                  Q_ENUMS \
-                                  Q_FLAGS \
-                                  Q_INTERFACES \
-                                  __attribute__
-           \endcode
+    makes sure that when processing the code below, for example, QDoc
+    will simply ignore the 'Q_ENUMS' and 'Q_FLAGS' expressions:
 
-           makes sure that when processing the code below, for
-           example, QDoc will simply ignore the 'Q_ENUMS' and
-           'Q_FLAGS' expressions:
+    \code
+        class Q_CORE_EXPORT Qt {
+            Q_OBJECT
+            Q_ENUMS(Orientation TextFormat BackgroundMode
+                    DateFormat ScrollBarPolicy FocusPolicy
+                    ContextMenuPolicy CaseSensitivity
+                    LayoutDirection ArrowType)
+            Q_ENUMS(ToolButtonStyle)
+            Q_FLAGS(Alignment)
+            Q_FLAGS(Orientations)
+            Q_FLAGS(DockWidgetAreas)
+
+          public:
+            ...
+        };
+    \endcode
 
-           \code
-               class Q_CORE_EXPORT Qt {
-                   Q_OBJECT
-                   Q_ENUMS(Orientation TextFormat BackgroundMode
-                           DateFormat ScrollBarPolicy FocusPolicy
-                           ContextMenuPolicy CaseSensitivity
-                           LayoutDirection ArrowType)
-                   Q_ENUMS(ToolButtonStyle)
-                   Q_FLAGS(Alignment)
-                   Q_FLAGS(Orientations)
-                   Q_FLAGS(DockWidgetAreas)
-
-               public:
-                   ...
-           };
-           \endcode
+    The Q_OBJECT macro, however, is an exception: QDoc recognizes this
+    particular non-standard construct, so there is no need specifying
+    it using the \tt {\l Cpp.ignoredirectives} variable.
 
-           The Q_OBJECT macro, however, is an exception: QDoc
-           recognizes this particular non-standard construct, so there
-           is no need specifying it using the \tt {\l
-           Cpp.ignoredirectives} variable.
+    Regarding the Q_CORE_EXPORT macro; see the documentation of the
+    \tt {\l Cpp.ignoretokens} variable.
 
-           Regarding the Q_CORE_EXPORT macro; see the documentation of
-           the \tt {\l Cpp.ignoretokens} variable.
+    See also \l Cpp.ignoretokens.
 
-           See also \l Cpp.ignoretokens.
+    \target Cpp.ignoretokens-variable
+    \section1  Cpp.ignoretokens 
 
-    \row
-        \o \bold  Cpp.ignoretokens \target Cpp.ignoretokens
-        \o \bold {The \c Cpp.ignoretokens variable makes QDoc ignore
-           the specified non-standard constructs, within C++ source code.}
+    The \c Cpp.ignoretokens variable makes QDoc ignore the specified
+    non-standard constructs, within C++ source code.
 
-           If not specified by the \tt {\l Cpp.ignoretokens} or \tt
-           {\l Cpp.ignoredirectives} variables, non-standard
-           constructs (typically macros) can result in erroneous
-           documentation.
+    If not specified by the \tt {\l Cpp.ignoretokens} or \tt {\l
+    Cpp.ignoredirectives} variables, non-standard constructs
+    (typically macros) can result in erroneous documentation.
 
-           In \l qt.qdocconf:
+    In \l qt.qdocconf:
 
-           \code
-           Cpp.ignoretokens = QAXFACTORY_EXPORT \
-                              QM_EXPORT_CANVAS \
-                              ...
-                              Q_COMPAT_EXPORT \
-                              Q_CORE_EXPORT \
-                              Q_EXPLICIT \
-                              Q_EXPORT \
-                              ...
-                              Q_TYPENAME        \
-                              Q_XML_EXPORT
-           \endcode
-
-           makes sure that when processing the code below, for
-           example, QDoc will simply ignore the 'Q_CORE_EXPORT'
-           expression:
+    \code
+    Cpp.ignoretokens = QAXFACTORY_EXPORT \
+                       QM_EXPORT_CANVAS \
+                       ...
+                       Q_COMPAT_EXPORT \
+                       Q_CORE_EXPORT \
+                       Q_EXPLICIT \
+                       Q_EXPORT \
+                       ...
+                       Q_TYPENAME        \
+                       Q_XML_EXPORT
+    \endcode
 
-           \code
-               class Q_CORE_EXPORT Qt {
-                   Q_OBJECT
-                   Q_ENUMS(Orientation TextFormat BackgroundMode
-                           DateFormat ScrollBarPolicy FocusPolicy
-                           ContextMenuPolicy CaseSensitivity
-                           LayoutDirection ArrowType)
-                   Q_ENUMS(ToolButtonStyle)
-                   Q_FLAGS(Alignment)
-                   Q_FLAGS(Orientations)
-                   Q_FLAGS(DockWidgetAreas)
-
-               public:
-                   ...
-           };
-           \endcode
+    makes sure that when processing the code below, for example, QDoc
+    will simply ignore the 'Q_CORE_EXPORT' expression:
 
-           Regarding the Q_OBJECT, Q_ENUMS and Q_FLAGS macros; see the
-           documentation of the \tt {\l Cpp.ignoredirectives}
-           variable.
+    \code
+        class Q_CORE_EXPORT Qt {
+            Q_OBJECT
+            Q_ENUMS(Orientation TextFormat BackgroundMode
+                    DateFormat ScrollBarPolicy FocusPolicy
+                    ContextMenuPolicy CaseSensitivity
+                    LayoutDirection ArrowType)
+            Q_ENUMS(ToolButtonStyle)
+            Q_FLAGS(Alignment)
+            Q_FLAGS(Orientations)
+            Q_FLAGS(DockWidgetAreas)
+          public:
+            ...
+        };
+    \endcode
 
-           See also \l Cpp.ignoredirectives.
+    Regarding the Q_OBJECT, Q_ENUMS and Q_FLAGS macros; see the
+    documentation of the \tt {\l Cpp.ignoredirectives} variable.
 
-    \endtable
+    See also \l Cpp.ignoredirectives.
 */
 
-
 /*!
     \page 24-qdoc-configuration-htmlvariables.html
     \previouspage C++ Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
+    \contentspage Table of Contents
     \nextpage Supporting Derived Projects
 
     \title HTML Specific Configuration Variables
@@ -8279,219 +8028,188 @@
     documentation's footer or postheader. The format of the variable
     values are raw HTML.
 
-    \section1 Alphabetical List
-
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.footer}{HTML.footer},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.postheader}
-       {HTML.postheader},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.style}{HTML.style},
-    \l {24-qdoc-configuration-htmlvariables.html#HTML.stylesheets}{HTML.stylesheets}
+    \target HTML.footer-variable
+    \section1 HTML.footer 
 
+    The \c HTML.footer variable defines the content of the generated
+    HTML documentation's footer.
 
-    \section1 Variable Descriptions
+    The footer is rendered at the bottom of the generated
+    documentation page.
 
-    \table
+    The variable's value is given as raw HTML code enclosed by
+    quotation marks. Note that if the value spans several lines, each
+    line needs to be enclosed by quotation marks.
 
-    \header
-        \o Variable
-        \o Description
+    For example in \l qt.qdocconf:
 
-    \row
-        \o \bold HTML.footer \target HTML.footer
-        \o \bold {The \c HTML.footer variable defines the content
-           of the generated HTML documentation's footer.}
+    \code
+        HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
+                      ...
+                      "</tr></table></div></address>"
+    \endcode
 
-           The footer is rendered at the bottom of the generated
-           documentation page.
+    The complete variable entry in \l qt.qdocconf provides the
+    standard footer of the \l {http://qt.nokia.com/doc/4.0/index.html}
+    {Qt Reference Documentation}.
 
-           The variable's value is given as raw HTML code enclosed by
-           quotation marks. Note that if the value spans several
-           lines, each line needs to be enclosed by quotation marks.
+    \target HTML.postheader-variable
+    \section1 HTML.postheader 
 
-           For example in \l qt.qdocconf:
+    The \c HTML.postheader variable defines the content of the
+    generated HTML documentation's postheader.
 
-           \code
-               HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
-                             ...
-                             "</tr></table></div></address>"
-           \endcode
+    The header is rendered at the top of the generated documentation
+    page.
 
-           The complete variable entry in \l qt.qdocconf provides the
-           standard footer of the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
-           Documentation}.
+    The variable's value is given as raw HTML enclosed by quotation
+    marks. Note that if the value spans several lines, each line needs
+    to be enclosed by quotation marks.
 
-    \row
-        \o \bold HTML.postheader \target HTML.postheader
-        \o \bold {The \c HTML.postheader variable defines the content
-           of the generated HTML documentation's postheader.}
+    For example in \l qt.qdocconf:
 
-           The header is rendered at the top of the generated
-           documentation page.
+    \code
+     HTML.postheader = "<table border=\"0\"..." \
+                       ...
+                       "<img src=\"images/trolltech-logo.png\" \
+                       "align=\"right\" width=\"203\" height=\"32\""\
+                      "border=\"0\" />" \
+                       "</td></tr>" \
+                       "</table>"
+    \endcode
 
-           The variable's value is given as raw HTML enclosed by
-           quotation marks. Note that if the value spans several
-           lines, each line needs to be enclosed by quotation marks.
+    The complete variable entry in \l qt.qdocconf provides the
+    standard header of the \l {http://qt.nokia.com/doc/4.0/index.html}
+    {Qt Reference Documentation}.
 
-           For example in \l qt.qdocconf:
+    \target HTML.style-variable
+    \section1 HTML.style 
 
-           \code
-            HTML.postheader = "<table border=\"0\"..." \
-                              ...
-                              "<img src=\"images/trolltech-logo.png\" \
-                              "align=\"right\" width=\"203\" height=\"32\""\
-                              "border=\"0\" />" \
-                              "</td></tr>" \
-                              "</table>"
-           \endcode
+    The HTML.style variable defines the style for
+    the generated HTML documentation.
 
-           The complete variable entry in \l qt.qdocconf provides the
-           standard header of the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
-           Documentation}.
+    The variable's value is given as raw HTML enclosed by quotation
+    marks. Note that if the value spans several lines, each line needs
+    to be enclosed by quotation marks.
 
-    \row
-        \o \bold HTML.style \target HTML.style
-        \o \bold {The HTML.style variable defines the style for
-           the generated HTML documentation.}
+    For example in \l qt.qdocconf:
 
-           The variable's value is given as raw HTML enclosed by
-           quotation marks. Note that if the value spans several
-           lines, each line needs to be enclosed by quotation marks.
+    \code
+    HTML.style = "h3.fn,span.fn" \
+                 "{ margin-left: 1cm; text-indent: -1cm; }\n" \
+                 "a:link { color: #004faf; text-decoration: none }\n" \
+                 "a:visited" \
+                 "{ color: #672967; text-decoration: none }\n" \
+                 "td.postheader { font-family: sans-serif }\n" \
+                 "tr.address { font-family: sans-serif }\n" \
+                 "body { background: #ffffff; color: black; }"
+    \endcode
 
-           For example in \l qt.qdocconf:
+    provides the HTML style for the \l
+    {http://qt.nokia.com/doc/4.0/index.html} {Qt Reference
+    Documentation}.
 
-           \code
-           HTML.style = "h3.fn,span.fn" \
-                        "{ margin-left: 1cm; text-indent: -1cm; }\n" \
-                        "a:link { color: #004faf; text-decoration: none }\n" \
-                        "a:visited" \
-                        "{ color: #672967; text-decoration: none }\n" \
-                        "td.postheader { font-family: sans-serif }\n" \
-                        "tr.address { font-family: sans-serif }\n" \
-                        "body { background: #ffffff; color: black; }"
-           \endcode
+    \target HTML.stylesheets-variable
+    \section1 HTML.stylesheets 
 
-           provides the HTML style for the \l
-           {http://qt.nokia.com/doc/4.0/index.html}{Qt Reference
-           Documentation}.
+    The HTML.stylesheets variable defines a list of stylesheets
+    to use for the generated HTML documentation.
 
-    \row
-        \o \bold HTML.stylesheets \target HTML.stylesheets
-        \o \bold {The HTML.stylesheets variable defines a list of stylesheets
-           to use for the generated HTML documentation.}
+    Using separate stylesheets for the documentation makes it easier
+    to customize and experiment with the style used once the contents
+    has been generated. Typically, it is only necessary to define a
+    single stylesheet for any set of documentation; for example:
 
-           Using separate stylesheets for the documentation makes it easier to
-           customize and experiment with the style used once the contents has
-           been generated. Typically, it is only necessary to define a single
-           stylesheet for any set of documentation; for example:
+    \code
+    HTML.stylesheets = classic.css
+    \endcode
 
-           \code
-           HTML.stylesheets = classic.css
-           \endcode
+    QDoc expects to find stylesheets in the directory containing the
+    \l qt.qdocconf file, and it will copy those specified to the output
+    directory alongside the HTML pages.
 
-           QDoc expects to find stylesheets in the directory containing the
-           \l qt.qdocconf file, and it will copy those specified to the output
-           directory alongside the HTML pages.
-    \endtable
 */
 
 /*!
     \page 25-qdoc-configuration-derivedprojects.html
     \previouspage HTML Specific Configuration Variables
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Compatibility
+    \contentspage Table of Contents
+    \nextpage Compatibility Issues
 
     \title Supporting Derived Projects
 
-    \tableofcontents
+    Some configuration variables allow you to use QDoc to support
+    Qt-based projects; i.e allow your project to contain links to the
+    online Qt documentation. This means that QDoc will be able to
+    create links to the class reference documentation, without any
+    explicit linking command.
 
-    Some particular configuration variables allow you to use QDoc to
-    support Qt-based projects; i.e to make projects, such as Qt Solutions,
-    contain references to the online Qt documentation. This
-    means that QDoc will be able to create links to the class reference
-    documentation, without any explicit linking command.
+    \target description-variable
+    \section1 description 
 
-    \section1 The Configuration Variables
+    The description variable holds a short description of the
+    associated project.
 
-    \section2 Alphabetical List
+    See also \l project.
 
-    \l{25-qdoc-configuration-derivedprojects.html#description}{description},
-    \l{25-qdoc-configuration-derivedprojects.html#indexes}{indexes},
-    \l{25-qdoc-configuration-derivedprojects.html#project}{project},
-    \l{25-qdoc-configuration-derivedprojects.html#url}{url}
+    \target indexes-variable
+    \section1 indexes 
 
-    \section2 Variable Descriptions
+    The \c indexes variable lists the index files that will be used to
+    generate references.
 
-    \table
-    \header
-        \o Variable
-        \o Description
-    \row
-        \o \bold description \target description
-        \o \bold {The description variable holds a short description of
-           the associated project.}
+    For example. to make a derived Qt project contain links to the Qt
+    Reference documentation, you need to specify the associated index
+    file:
 
-           See also \l project.
-
-    \row
-        \o \bold indexes \target indexes
-        \o \bold {The \c indexes variable lists the index files
-           that will be used to generate references.}
-
-           For example. to make a derived Qt project contain links to
-           the Qt Reference documentation, you need to specify the
-           associated index file:
+    \code
+        indexes = $QTDIR/doc/html/qt.index
+    \endcode
 
-           \code
-               indexes = $QTDIR/doc/html/qt.index
-           \endcode
+    See also \l project and \l url.
 
-           See also \l project and \l url.
+    \target project-variable
+    \section1 project 
 
-    \row
-        \o \bold project \target project
-        \o \bold {The \c project variable provides a name for the project
-           associated with the \c .qdocconf file.}
+    The \c project variable provides a name for the project associated
+    with the \c .qdocconf file.
 
-           The project's name is used to form a file name for the
-           associated project's \i index file. For example:
+    The project's name is used to form a file name for the associated
+    project's \e index file.
 
-           \code
-               project = QtMotif
-           \endcode
+    \code
+        project = QtMotif
+    \endcode
 
-           This will cause an index file called \c qtmotif.index to be
-           created.
+    This will cause an index file called \c qtmotif.index to be
+    created.
 
-           See also \l description and \l indexes.
-    \row
-        \o \bold url \target url
-        \o \bold {The \c url variable holds the base URL for the
-            reference documentation associated with the current project.}
+    See also \l description and \l indexes.
 
-            The URL is stored in the generated index file for the
-            project. When we use the index on its own, QDoc will use
-            this as the base URL when constructing links to classes,
-            functions, and other things listed in the index.
+    \target url-variable
+    \section1 url 
 
-            For example:
+    The \c url variable holds the base URL for the reference
+    documentation associated with the current project.
 
-            \code
-                 project     = Qt
-                 description = Qt Reference Documentation
-                 url         = http://qt.nokia.com/doc/4.0
+    The URL is stored in the generated index file for the
+    project. When we use the index on its own, QDoc will use this as
+    the base URL when constructing links to classes, functions, and
+    other things listed in the index.
 
-                 ...
-            \endcode
+    \code
+    project     = Qt
+    description = Qt Reference Documentation
+    url         = http://qt.nokia.com/doc/4.0
 
-            This makes sure that whenever \c qt.index is used to generate
-            references to for example Qt classes, the base URL is
-            \c http://qt.nokia.com/doc/4.0.
+         ...
+    \endcode
 
-            See also \l indexes.
+    This makes sure that whenever \c qt.index is used to generate
+    references to for example Qt classes, the base URL is \c
+    http://qt.nokia.com/doc/4.0.
 
-    \endtable
+    See also \l indexes.
 
     \target howto
     \section1 How to Support Derived Projects
@@ -8544,7 +8262,7 @@
     The code above requires that you run QDoc from the directory that
     contains this file. You need to include the compat.qdocconf
     file for compatibility reasons; this is further explained in the
-    \l {QDoc Compatibility} section.
+    \l {Compatibility Issues} section.
 
     \bold {To resolve the actual links to Qt classes, the
     mini-project's \c .qdocconf file needs to assign a value to the \l
@@ -8561,47 +8279,43 @@
 /*!
     \page 26-qdoc-commands-compatibility.html
     \previouspage Supporting Derived Projects
-    \contentspage QDoc Manual - Table of Contents
-    \nextpage QDoc Commands - Alphabetical List
+    \contentspage Table of Contents
+    \nextpage qt.qdocconf
 
-    \title QDoc Compatibility
-
-    \tableofcontents
+    \title Compatibility Issues
 
     \section1 General Description
 
     \target reason
 
-    QDoc is a tool that constantly evolves to suit our needs, for that
-    reason there are some compatibility issues in the transition
-    between old and new practices.
+    Because QDoc evolves to suit our documentation needs, there can be
+    some compatibility issues when converting to a new version.
 
-    To make the transition as smooth and rapid as possible, the
-    general idea is to adopt the new commands and usage in new
-    documentation.  While waiting for the occurrences of the old
-    practices to be eliminated from the old parts of the
-    documentation, you can map the new commands and usage to the old
-    ones using a compat.qdocconf file.
+    To allow you to proceed at your own speed when converting your
+    qdoc comments to use new qdoc commands and formats, the ability to
+    include a configuration file called \c {compat.qdocconf} is
+    provided.
 
-    A compat.qdocconf file is a separate \c .qdocconf file which you
-    can include in your main configuration file. It typically contains
-    the mapping between old and new commands using the \l alias and \l
-    {22-qdoc-configuration-generalvariables.html#macro}{macro}
-    configuration variables.
+    A \c {compat.qdocconf} file is a separate configuration file,
+    which you include in your main configuration file. It typically
+    contains the mappings from old qdoc commands to new ones using 
+    \l {alias} and 
+    \l {22-qdoc-configuration-generalvariables.html#macro-variable}
+    {macro} configuration variables.
 
     \section1 Qt Compatibility
 
     In Qt's documentation there still exist occurrences of old
-    commands, and the Qt \l {qt.qdocconf}{configuration file} needs to
+    commands, and the Qt \l {qt.qdocconf} {configuration file} needs to
     include the compat.qdocconf file tailored for Qt. For more
     detailed information about the commands creating compatibility
-    issues, see the \l {Command Comments}{command comments}.
+    issues, see the \l {Command Comments} {command comments}.
 
-    \section2 Qt's current compat.qdocconf file
+    \section1 Qt's current compat.qdocconf file
 
     \quotefile files/compat.qdocconf
 
-    \section2 Command Comments
+    \section1 Command Comments
 
     \table
     \header
@@ -8619,7 +8333,7 @@
            \\e command name.
 
            \bold {We still need to use the \\e command to render in
-           italic in new documentation for \l {reason}{compatibility
+           italic in new documentation for \l {reason} {compatibility
            reasons}}.
 
     \row
@@ -8633,7 +8347,7 @@
 
            \bold {We still need to use the \\input command to include
            plain text in new documentation for \l
-           {reason}{compatibility reasons}}.
+           {reason} {compatibility reasons}}.
 
     \row
         \o \\quotefile \target quotefile-versus-include
@@ -8646,7 +8360,7 @@
 
            \bold {We still need to use the \\include command to quote
            the entire contents of a source file in new documentation
-           for \l {reason}{compatibility reasons}}.
+           for \l {reason} {compatibility reasons}}.
 
     \row
         \o \\quotefromfile \target quotefromfile-versus-quotefile
@@ -8656,7 +8370,7 @@
            that command to quote an entire file, we introduce the new
            \\quotefromfile command to quote from file.
 
-           \bold {Use \l {quotefromfile}{\\quotefromfile} to quote
+           \bold {Use \l {quotefromfile-command} {\\quotefromfile} to quote
            parts from a source file in new documentation}.
 
     \row
@@ -8667,7 +8381,7 @@
            in italic instead, we introduce the new \\o command for
            this purpose.
 
-           \bold {Use \l {o}{\\o} to indicate list and table items in
+           \bold {Use \l {o-command} {\\o} to indicate list and table items in
            new documentation}.
 
     \row
@@ -8676,7 +8390,7 @@
         \o These commands are equivalent, and represent a simple name
           change.
 
-          \bold {Use \l {quotation}{\\quotation} in new
+          \bold {Use \l {quotation} {\\quotation} in new
           documentation}.
 
     \row
@@ -8685,116 +8399,129 @@
         \o These commands are equivalent, and represent a simple name
            change.
 
-           \bold {Use \l {image}{\\image} in new documentation}.
+           \bold {Use \l {image-command} {\\image} in new documentation}.
 
     \endtable
 */
 
 /*!
     \page 27-qdoc-commmands-alphabetical.html
-    \previouspage QDoc Compatibility
-    \contentspage QDoc Manual - Table of Contents
+    \previouspage Introduction to QDoc
+    \contentspage Table of Contents
+    \nextpage Topic Commands
+
+    \title Command Index
 
-    \title QDoc Commands - Alphabetical List
+    This is a complete, alphabetized list of the QDoc commands.
 
     \list
 
-    \o \l {04-qdoc-commands-textformatting.html#a}{\\a}
-    \o \l {11-qdoc-commands-documentcontents.html#abstract}{\\abstract}
-    \o \l {06-qdoc-commands-verbatimcode.html#badcode}{\\badcode}
-    \o \l {04-qdoc-commands-textformatting.html#bold}{\\bold}
-    \o \l {11-qdoc-commands-documentcontents.html#brief}{\\brief}
-    \o \l {04-qdoc-commands-textformatting.html#c}{\\c}
-    \o \l {09-qdoc-commands-graphic.html#caption}{\\caption}
-    \o \l {05-qdoc-commands-documentstructuring.html#chapter}{\\chapter}
-    \o \l {13-qdoc-commands-topical.html#class}{\\class}
-    \o \l {06-qdoc-commands-verbatimcode.html#code}{\\code}
-    \o \l {07-0-qdoc-commands-quoting.html#codeline}{\\codeline},
-    \o \l {16-qdoc-commands-status.html#compat}{\\compat}
-    \o \l {15-qdoc-commands-navigation.html#contentspage}{\\contentspage}
-    \o \l {07-0-qdoc-commands-quoting.html#dots}{\\dots}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#else}{\\else}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#endif}{\\endif}
-    \o \l {13-qdoc-commands-topical.html#enum}{\\enum}
-    \o \l {13-qdoc-commands-topical.html#example-command}{\\example}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#expire}{\\expire}
-    \o \l {13-qdoc-commands-topical.html#externalpage}{\\externalpage}
-    \o \l {13-qdoc-commands-topical.html#fn}{\\fn}
-    \o \l {11-qdoc-commands-documentcontents.html#footnote}{\\footnote}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist}{\\generatelist}
-    \o \l {13-qdoc-commands-topical.html#group}{\\group}
-    \o \l {10-qdoc-commands-container.html#header}{\\header}
-    \o \l {13-qdoc-commands-topical.html#headerfile}{\\headerfile}
-    \o \l {04-qdoc-commands-textformatting.html#i}{\\i}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#if}{\\if}
-    \o \l {09-qdoc-commands-graphic.html#image}{\\image}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#include}{\\include}
-    \o \l {15-qdoc-commands-navigation.html#indexpage}{\\indexpage}
-    \o \l {19-qdoc-commands-grouping.html#ingroup}{\\ingroup}
-    \o \l {19-qdoc-commands-grouping.html#inmodule}{\\inmodule}
-    \o \l {09-qdoc-commands-graphic.html#inlineimage}{\\inlineimage}
-    \o \l {16-qdoc-commands-status.html#internal}{\\internal}
-    \o \l {08-qdoc-commands-linking.html#keyword}{\\keyword}
-    \o \l {08-qdoc-commands-linking.html#l}{\\l}
-    \o \l {11-qdoc-commands-documentcontents.html#legalese}{\\legalese}
-    \o \l {10-qdoc-commands-container.html#list}{\\list}
-    \o \l {13-qdoc-commands-topical.html#macro}{\\macro}
-    \o \l {19-qdoc-commands-grouping.html#mainclass}{\\mainclass}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#meta}{\\meta}
-    \o \l {13-qdoc-commands-topical.html#module}{\\module}
-    \o \l {13-qdoc-commands-topical.html#namespace}{\\namespace}
-    \o \l {15-qdoc-commands-navigation.html#nextpage}{\\nextpage}
-    \o \l {06-qdoc-commands-verbatimcode.html#newcode}{\\newcode}
-    \o \l {17-qdoc-commands-thread.html#nonreentrant}{\\nonreentrant}
-    \o \l {10-qdoc-commands-container.html#o}{\\o}
-    \o \l {16-qdoc-commands-status.html#obsolete}{\\obsolete}
-    \o \l {06-qdoc-commands-verbatimcode.html#oldcode}{\\oldcode}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#omit}{\\omit}
-    \o \l {10-qdoc-commands-container.html#omitvalue}{\\omitvalue}
-    \o \l {18-qdoc-commands-relating.html#overload}{\\overload}
-    \o \l {13-qdoc-commands-topical.html#page}{\\page}
-    \o \l {05-qdoc-commands-documentstructuring.html#part}{\\part}
-    \o \l {16-qdoc-commands-status.html#preliminary}{\\preliminary}
-    \o \l {15-qdoc-commands-navigation.html#previouspage}{\\previouspage}
-    \o \l {07-0-qdoc-commands-quoting.html#printline}{\\printline}
-    \o \l {07-0-qdoc-commands-quoting.html#printto}{\\printto}
-    \o \l {07-0-qdoc-commands-quoting.html#printuntil}{\\printuntil}
-    \o \l {13-qdoc-commands-topical.html#property}{\\property}
-    \o \l {11-qdoc-commands-documentcontents.html#quotation}{\\quotation}
-    \o \l {07-0-qdoc-commands-quoting.html#quotefile}{\\quotefile}
-    \o \l {07-0-qdoc-commands-quoting.html#quotefromfile}{\\quotefromfile}
-    \o \l {12-0-qdoc-commands-miscellaneous.html#raw}{\\raw}
-    \o \l {17-qdoc-commands-thread.html#reentrant}{\\reentrant}
-    \o \l {18-qdoc-commands-relating.html#reimp}{\\reimp}
-    \o \l {18-qdoc-commands-relating.html#relates}{\\relates}
-    \o \l {10-qdoc-commands-container.html#row}{\\row}
-    \o \l {08-qdoc-commands-linking.html#sa}{\\sa}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionOne}{\\section1}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionTwo}{\\section2}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionThree}{\\section3}
-    \o \l {05-qdoc-commands-documentstructuring.html#sectionFour}{\\section4}
-    \o \l {13-qdoc-commands-topical.html#service}{\\service}
-    \o \l {16-qdoc-commands-status.html#since}{\\since}
-    \o \l {07-0-qdoc-commands-quoting.html#skipline}{\\skipline}
-    \o \l {07-0-qdoc-commands-quoting.html#skipto}{\\skipto}
-    \o \l {07-0-qdoc-commands-quoting.html#skipuntil}{\\skipuntil}
-    \o \l {07-0-qdoc-commands-quoting.html#snippet}{\\snippet},
-    \o \l {15-qdoc-commands-navigation.html#startpage}{\\startpage}
-    \o \l {04-qdoc-commands-textformatting.html#sub}{\\sub}
-    \o \l {20-qdoc-commands-title.html#subtitle}{\\subtitle}
-    \o \l {04-qdoc-commands-textformatting.html#sup}{\\sup}
-    \o \l {10-qdoc-commands-container.html#table}{\\table}
-    \o \l {11-qdoc-commands-documentcontents.html#tableofcontents}
-          {\\tableofcontents}
-    \o \l {08-qdoc-commands-linking.html#target}{\\target}
-    \o \l {17-qdoc-commands-thread.html#threadsafe}{\\threadsafe}
-    \o \l {20-qdoc-commands-title.html#title}{\\title}
-    \o \l {04-qdoc-commands-textformatting.html#tt}{\\tt}
-    \o \l {13-qdoc-commands-topical.html#typedef}{\\typedef}
-    \o \l {04-qdoc-commands-textformatting.html#underline}{\\underline}
-    \o \l {13-qdoc-commands-topical.html#variable}{\\variable}
-    \o \l {10-qdoc-commands-container.html#value}{\\value}
-    \o \l {11-qdoc-commands-documentcontents.html#warning}{\\warning}
+    \o \l {04-qdoc-commands-textmarkup.html#a-command} {\\a}
+    \o \l {11-qdoc-commands-specialcontent.html#abstract-command} {\\abstract}
+    \o \l {06-qdoc-commands-includecodeinline.html#badcode-command} {\\badcode}
+    \o \l {04-qdoc-commands-textmarkup.html#bold-command} {\\bold}
+    \o \l {11-qdoc-commands-specialcontent.html#brief-command} {\\brief}
+    \o \l {04-qdoc-commands-textmarkup.html#c-command} {\\c}
+    \o \l {09-qdoc-commands-includingimages.html#caption-command} {\\caption}
+    \o \l {05-qdoc-commands-documentstructure.html#chapter-command} {\\chapter}
+    \o \l {13-qdoc-commands-topics.html#class-command} {\\class}
+    \o \l {06-qdoc-commands-includecodeinline.html#code-command} {\\code}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#codeline-command} {\\codeline},
+    \o \l {16-qdoc-commands-status.html#compat-command} {\\compat}
+    \o \l {15-qdoc-commands-navigation.html#contentspage-command} {\\contentspage}
+    \o \l {16-qdoc-commands-status.html#default-command} {\\default} \span {class="newStuff"} {(new)}
+    \o \l {04-qdoc-commands-textmarkup.html#div-command} {\\div} \span {class="newStuff"} {(new)}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#dots-command} {\\dots}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#else-command} {\\else}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#endif-command} {\\endif}
+    \o \l {13-qdoc-commands-topics.html#enum-command} {\\enum}
+    \o \l {13-qdoc-commands-topics.html#example-command} {\\example}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#expire-command} {\\expire}
+    \o \l {13-qdoc-commands-topics.html#externalpage-command} {\\externalpage}
+    \o \l {13-qdoc-commands-topics.html#fn-command} {\\fn}
+    \o \l {11-qdoc-commands-specialcontent.html#footnote-command} {\\footnote}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#generatelist-command} {\\generatelist}
+    \o \l {13-qdoc-commands-topics.html#group-command} {\\group}
+    \o \l {10-qdoc-commands-tablesandlists.html#header-command} {\\header}
+    \o \l {13-qdoc-commands-topics.html#headerfile-command} {\\headerfile}
+    \o \l {04-qdoc-commands-textmarkup.html#i-command} {\\i}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#if-command} {\\if}
+    \o \l {09-qdoc-commands-includingimages.html#image-command} {\\image}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\include}
+    \o \l {15-qdoc-commands-navigation.html#indexpage-command} {\\indexpage}
+    \o \l {19-qdoc-commands-grouping.html#ingroup-command} {\\ingroup}
+    \o \l {18-qdoc-commands-relating.html#inherits-command}{\\inherits} \span {class="newStuff"} {(new)}
+    \o \l {19-qdoc-commands-grouping.html#inmodule-command} {\\inmodule}
+    \o \l {09-qdoc-commands-includingimages.html#inlineimage-command} {\\inlineimage}
+    \o \l {16-qdoc-commands-status.html#internal-command} {\\internal}
+    \o \l {08-qdoc-commands-creatinglinks.html#keyword-command} {\\keyword}
+    \o \l {08-qdoc-commands-creatinglinks.html#l-command} {\\l}
+    \o \l {11-qdoc-commands-specialcontent.html#legalese-command} {\\legalese}
+    \o \l {10-qdoc-commands-tablesandlists.html#list-command} {\\list}
+    \o \l {13-qdoc-commands-topics.html#macro-command} {\\macro}
+    \o \l {19-qdoc-commands-grouping.html#mainclass-command} {\\mainclass}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#meta-command} {\\meta}
+    \o \l {13-qdoc-commands-topics.html#module-command} {\\module}
+    \o \l {13-qdoc-commands-topics.html#namespace-command} {\\namespace}
+    \o \l {15-qdoc-commands-navigation.html#nextpage-command} {\\nextpage}
+    \o \l {06-qdoc-commands-includecodeinline.html#newcode-command} {\\newcode}
+    \o \l {17-qdoc-commands-thread.html#nonreentrant-command} {\\nonreentrant}
+    \o \l {10-qdoc-commands-tablesandlists.html#o-command} {\\o}
+    \o \l {16-qdoc-commands-status.html#obsolete-command} {\\obsolete}
+    \o \l {06-qdoc-commands-includecodeinline.html#oldcode-command} {\\oldcode}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#omit-command} {\\omit}
+    \o \l {10-qdoc-commands-tablesandlists.html#omitvalue-command} {\\omitvalue}
+    \o \l {18-qdoc-commands-relating.html#overload-command} {\\overload}
+    \o \l {13-qdoc-commands-topics.html#page-command} {\\page}
+    \o \l {05-qdoc-commands-documentstructure.html#part-command} {\\part}
+    \o \l {16-qdoc-commands-status.html#preliminary-command} {\\preliminary}
+    \o \l {15-qdoc-commands-navigation.html#previouspage-command} {\\previouspage}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printline-command} {\\printline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printto-command} {\\printto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#printuntil-command} {\\printuntil}
+    \o \l {13-qdoc-commands-topics.html#property-command} {\\property}
+    \o \l {13-qdoc-commands-topics.html#qmlattachedproperty-command} {\\qmlattachedproperty} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlattachedsignal-command} {\\qmlattachedsignal} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlbasictype-command} {\\qmlbasictype} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlclass-command} {\\qmlclass} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlmethod-command} {\\qmlmethod} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlproperty-command} {\\qmlproperty} \span {class="newStuff"} {(new)}
+    \o \l {13-qdoc-commands-topics.html#qmlsignal-command} {\\qmlsignal} \span {class="newStuff"} {(new)}
+    \o \l {11-qdoc-commands-specialcontent.html#quotation-command} {\\quotation}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefile-command} {\\quotefile}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command} {\\quotefromfile}
+    \o \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\raw} \span {class="newStuff"} {(avoid)}
+    \o \l {17-qdoc-commands-thread.html#reentrant-command} {\\reentrant}
+    \o \l {18-qdoc-commands-relating.html#reimp-command} {\\reimp}
+    \o \l {18-qdoc-commands-relating.html#relates-command} {\\relates}
+    \o \l {10-qdoc-commands-tablesandlists.html#row-command} {\\row}
+    \o \l {08-qdoc-commands-creatinglinks.html#sa-command} {\\sa}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionOne-command} {\\section1}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionTwo-command} {\\section2}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionThree-command} {\\section3}
+    \o \l {05-qdoc-commands-documentstructure.html#sectionFour-command} {\\section4}
+    \o \l {13-qdoc-commands-topics.html#service-command} {\\service}
+    \o \l {16-qdoc-commands-status.html#since-command} {\\since}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipline-command} {\\skipline}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipto-command} {\\skipto}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#skipuntil-command} {\\skipuntil}
+    \o \l {07-0-qdoc-commands-includingexternalcode.html#snippet-command} {\\snippet},
+    \o \l {04-qdoc-commands-textmarkup.html#span-command} {\\span} \span {class="newStuff"} {(new)}
+    \o \l {15-qdoc-commands-navigation.html#startpage-command} {\\startpage}
+    \o \l {04-qdoc-commands-textmarkup.html#sub-command} {\\sub}
+    \o \l {20-qdoc-commands-namingthings.html#subtitle-command} {\\subtitle}
+    \o \l {04-qdoc-commands-textmarkup.html#sup-command} {\\sup}
+    \o \l {10-qdoc-commands-tablesandlists.html#table-command} {\\table}
+    \o \l {11-qdoc-commands-specialcontent.html#tableofcontents-command} {\\tableofcontents}
+    \o \l {08-qdoc-commands-creatinglinks.html#target-command} {\\target}
+    \o \l {17-qdoc-commands-thread.html#threadsafe-command} {\\threadsafe}
+    \o \l {20-qdoc-commands-namingthings.html#title-command} {\\title}
+    \o \l {04-qdoc-commands-textmarkup.html#tt-command} {\\tt}
+    \o \l {13-qdoc-commands-topics.html#typedef-command} {\\typedef}
+    \o \l {04-qdoc-commands-textmarkup.html#underline-command} {\\underline}
+    \o \l {13-qdoc-commands-topics.html#variable-command} {\\variable}
+    \o \l {10-qdoc-commands-tablesandlists.html#value-command} {\\value}
+    \o \l {11-qdoc-commands-specialcontent.html#warning-command} {\\warning}
     \endlist
 */
 
diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
deleted file mode 100644
index 53486be..0000000
--- a/tools/qdoc3/doc/qdoc-manual.qdocconf
+++ /dev/null
@@ -1,234 +0,0 @@
-project          = QDoc
-description      = QDoc3 Manual
-
-indexes          = ../../../doc/html/qt.index
-
-outputdir        = html
-
-sources          = qdoc-manual.qdoc
-sourcedirs       = $PWD
-
-exampledirs     += $PWD \
-                   ../../../examples
-
-imagedirs       += images
-
-extraimages.HTML = qt-logo
-
-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 Reference Documentation</span></a>\n" \
-                          "    <div id=\"narrowsearch\"></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" \
-                          "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
-                          "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
-                          "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
-                          "          DOC</a></li>\n" \
-                          "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-                          "      </ul>\n" \
-                          "    </div>\n" \
-                          "    <div id=\"shortCut\">\n" \
-                          "      <ul>\n" \
-                          "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
-                          "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
-                          "        </a></li>\n" \
-                          "      </ul>\n" \
-                          "     </div>\n" \
-                          " <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
-                          "                         <li><a href=\"#\">API Lookup</a> \n" \
-                          "                                 <ul> \n" \
-                          "                                         <li><a href=\"classes.html\">Class index</a></li> \n" \
-                          "           <li><a href=\"functions.html\">Function index</a></li> \n" \
-                          "           <li><a href=\"modules.html\">Modules</a></li> \n" \
-                          "           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
-                          "           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
-                          "           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
-                          "                     </ul> \n" \
-                          "                         </li> \n" \
-                          "                         <li><a href=\"#\">Qt Topics</a> \n" \
-                          "                                 <ul> \n" \
-                          "                                            <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
-                          "                                            <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
-                          "                                            <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
-                          "                                            <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
-                          "                                            <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
-                          "                                            <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
-                          "                                            <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
-                          "                      </ul> \n" \
-                          "                                 </li> \n" \
-                          "                                 <li><a href=\"#\">Examples</a> \n" \
-                          "                                         <ul> \n" \
-                          "                               <li><a href=\"all-examples.html\">Examples</a></li> \n" \
-                          "                               <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
-                          "                               <li><a href=\"demos.html\">Demos</a></li> \n" \
-                          "                               <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
-                          "                        </ul> \n" \
-                          "                                         </li> \n" \
-                          "                                 </ul> \n" \
-                          "    </div>\n" \
-                          "  </div>\n" \
-                          "  <div class=\"wrapper\">\n" \
-                          "    <div class=\"hd\">\n" \
-                          "      <span></span>\n" \
-                          "    </div>\n" \
-                          "    <div class=\"bd group\">\n" \
-                          "      <div class=\"sidebar\">\n" \
-                          "        <div class=\"searchlabel\">\n" \
-                          "          Search index:</div>\n" \
-                          "        <div class=\"search\" id=\"sidebarsearch\">\n" \
-                          "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-                          "            <fieldset>\n" \
-                          "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-                          " <div id=\"resultdialog\"> \n" \
-                          " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
-                          " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
-                          " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
-                          " <ul id=\"resultlist\" class=\"all\"> \n" \
-                          " </ul> \n" \
-                          " </div> \n" \
-                          "            </fieldset>\n" \
-                          "          </form>\n" \
-                          "        </div>\n" \
-                          "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-                          "          <h2 title=\"API Lookup\"><span></span>\n" \
-                          "            API Lookup</h2>\n" \
-                          "          <div  id=\"list001\" class=\"list\">\n" \
-                          "          <ul id=\"ul001\" >\n" \
-                          "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
-                          "            </ul> \n" \
-                          "          </div>\n" \
-                          "        </div>\n" \
-                          "        <div class=\"box bottombar\" id=\"topics\">\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=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
-                          "                           <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
-                          "            </ul>  \n" \
-                          "          </div>\n" \
-                          "        </div>\n" \
-                          "        <div class=\"box\" id=\"examples\">\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=\"all-examples.html\">Examples</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
-                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-                          "            </ul> \n" \
-                          "          </div>\n" \
-                          "        </div>\n" \
-                          "      </div>\n" \
-                          "      <div class=\"wrap\">\n" \
-                          "        <div class=\"toolbar\">\n" \
-                          "          <div class=\"breadcrumb toolblock\">\n" \
-                          "            <ul>\n" \
-                          "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
-                          "              <!--  Bread crumbs goes here -->\n"
-
-HTML.postpostheader     = "            </ul>\n" \
-                          "          </div>\n" \
-                          "          <div class=\"toolbuttons toolblock\">\n" \
-                          "            <ul>\n" \
-                          "              <li id=\"smallA\" class=\"t_button\">A</li>\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" \
-                          "                <span>Print</span></a></li>\n" \
-                          "            </ul>\n" \
-                          "        </div>\n" \
-                          "        </div>\n" \
-                          "        <div class=\"content mainContent\">\n"
-
-HTML.footer             = "" \
-                          "        <div class=\"feedback t_button\">\n" \
-                          "          [+] Documentation Feedback</div>\n" \
-                          "      </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-2011 Nokia Corporation and/or its\n" \
-                          "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-                          "      in Finland and/or other countries worldwide.</p>\n" \
-                          "    <p>\n" \
-                          "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-                          "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-                          "    <br />\n" \
-                          "    <p>\n" \
-                          "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-                          "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-                          "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-                          "    <p>\n" \
-                          "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-                          "      Free Documentation License version 1.3</a>\n" \
-                          "      as published by the Free Software Foundation.</p>\n" \
-                          "  </div>\n" \
-                          "  <div id=\"feedbackBox\">\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 id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
-                          "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
-                          "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
-                          "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-                          "    </form>\n" \
-                          "  </div>\n" \
-                          "  <div id=\"blurpage\">\n" \
-                          "  </div>\n" 
-
-# This stuff is used by the Qt 4.7 doc format.
-scriptdirs              = ../../../doc/src/template/scripts
-styledirs               = ../../../doc/src/template/style
-
-scripts.HTML		= functions.js \
-			  narrow.js \
-			  superfish.js \
-			  jquery.js
-
-styles.HTML		= style.css \
-			  narrow.css \
-			  superfish.css \
-			  superfish_skin.css \
-			  style_ie6.css \
-			  style_ie7.css \
-			  style_ie8.css
-
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = scripts/functions.js \
-                             scripts/jquery.js \
-                             scripts/narrow.js \
-                             scripts/superfish.js \
-                             style/narrow.css \
-                             style/superfish.css \
-                             style/style_ie6.css \
-                             style/style_ie7.css \
-                             style/style_ie8.css \
-                             style/style.css
-
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index b4768db..f05c030 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -549,7 +549,10 @@ void Generator::generateAlsoList(const Node *node, CodeMarker *marker)
 
     if (!alsoList.isEmpty()) {
         Text text;
-        text << Atom::ParaLeft << "See also ";
+        text << Atom::ParaLeft
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
+             << "See also "
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD);
 
         for (int i = 0; i < alsoList.size(); ++i)
             text << alsoList.at(i) << separator(i, alsoList.size());
@@ -559,6 +562,28 @@ void Generator::generateAlsoList(const Node *node, CodeMarker *marker)
     }
 }
 
+/*!
+  Generate a list of maintainers in the output
+ */
+void Generator::generateMaintainerList(const InnerNode* node, CodeMarker* marker)
+{
+    QStringList sl = getMetadataElements(node,"maintainer");
+
+    if (!sl.isEmpty()) {
+        Text text;
+        text << Atom::ParaLeft
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
+             << "Maintained by: "
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD);
+
+        for (int i = 0; i < sl.size(); ++i)
+            text << sl.at(i) << separator(i, sl.size());
+
+        text << Atom::ParaRight;
+        generateText(text, node, marker);
+    }
+}
+
 void Generator::generateInherits(const ClassNode *classe, CodeMarker *marker)
 {
     QList<RelatedClass>::ConstIterator r;
@@ -566,7 +591,10 @@ void Generator::generateInherits(const ClassNode *classe, CodeMarker *marker)
 
     if (!classe->baseClasses().isEmpty()) {
         Text text;
-        text << Atom::ParaLeft << "Inherits ";
+        text << Atom::ParaLeft
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
+             << "Inherits: "
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD);
 
         r = classe->baseClasses().begin();
         index = 0;
@@ -604,7 +632,10 @@ void Generator::generateInheritedBy(const ClassNode *classe,
 {
     if (!classe->derivedClasses().isEmpty()) {
         Text text;
-        text << Atom::ParaLeft << "Inherited by ";
+        text << Atom::ParaLeft
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
+             << "Inherited by: "
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD);
 
         appendSortedNames(text, classe, classe->derivedClasses(), marker);
         text << Atom::ParaRight;
@@ -1275,4 +1306,44 @@ QString Generator::outputPrefix(const QString &nodeType)
     return outputPrefixes[nodeType];
 }
 
+/*!
+  Looks up the tag \a t in the map of metadata values for the
+  current topic in \a inner. If a value for the tag is found,
+  the value is returned.
+
+  \note If \a t is found in the metadata map, it is erased.
+  i.e. Once you call this function for a particular \a t,
+  you consume \a t.
+ */
+QString Generator::getMetadataElement(const InnerNode* inner, const QString& t)
+{
+    QString s;
+    QStringMultiMap& metaTagMap = const_cast<QStringMultiMap&>(inner->doc().metaTagMap());
+    QStringMultiMap::iterator i = metaTagMap.find(t);
+    if (i != metaTagMap.end()) {
+        s = i.value();
+        metaTagMap.erase(i);
+    }
+    return s;
+}
+
+/*!
+  Looks up the tag \a t in the map of metadata values for the
+  current topic in \a inner. If values for the tag are found,
+  they are returned in a string list.
+
+  \note If \a t is found in the metadata map, all the pairs
+  having the key \a t are erased. i.e. Once you call this
+  function for a particular \a t, you consume \a t.
+ */
+QStringList Generator::getMetadataElements(const InnerNode* inner, const QString& t)
+{
+    QStringList s;
+    QStringMultiMap& metaTagMap = const_cast<QStringMultiMap&>(inner->doc().metaTagMap());
+    s = metaTagMap.values(t);
+    if (!s.isEmpty())
+        metaTagMap.remove(t);
+    return s;
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 4482313..8fd5370 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -106,6 +106,7 @@ class Generator
 #endif
     virtual void generateBody(const Node *node, CodeMarker *marker);
     virtual void generateAlsoList(const Node *node, CodeMarker *marker);
+    virtual void generateMaintainerList(const InnerNode* node, CodeMarker* marker);
     virtual void generateInherits(const ClassNode *classe,
                                   CodeMarker *marker);
     virtual void generateInheritedBy(const ClassNode *classe,
@@ -141,7 +142,6 @@ class Generator
     void unknownAtom(const Atom *atom);
     QMap<QString, QString> &formattingLeftMap();
     QMap<QString, QString> &formattingRightMap();
-
     QMap<QString, QStringList> editionModuleMap;
     QMap<QString, QStringList> editionGroupMap;
 
@@ -150,6 +150,9 @@ class Generator
     static void supplementAlsoList(const Node *node, QList<Text> &alsoList);
     static QString outputPrefix(const QString &nodeType);
 
+    QString getMetadataElement(const InnerNode* inner, const QString& t);
+    QStringList getMetadataElements(const InnerNode* inner, const QString& t);
+
  private:
     void generateReimplementedFrom(const FunctionNode *func,
                                    CodeMarker *marker);
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index f2e2f04..1c7fcbf 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -350,6 +350,14 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
             }
             break;
 
+        case Node::Variable:
+            {
+                QString location = HtmlGenerator::fullDocumentLocation(node);
+                project.files.insert(location.left(location.lastIndexOf(QLatin1Char('#'))));
+                project.keywords.append(keywordDetails(node));
+            }
+            break;
+
         // Fake nodes (such as manual pages) contain subtypes, titles and other
         // attributes.
         case Node::Fake: {
@@ -694,6 +702,8 @@ void HelpProjectWriter::generateProject(HelpProject &project)
                 }
             } else {
                 // Find a contents node and navigate from there, using the NextLink values.
+                QSet<QString> visited;
+
                 foreach (const Node *node, subproject.nodes) {
                     QString nextTitle = node->links().value(Node::NextLink).first;
                     if (!nextTitle.isEmpty() &&
@@ -707,9 +717,10 @@ void HelpProjectWriter::generateProject(HelpProject &project)
                         while (nextPage) {
                             writeNode(project, writer, nextPage);
                             nextTitle = nextPage->links().value(Node::NextLink).first;
-                            if(nextTitle.isEmpty())
+                            if (nextTitle.isEmpty() || visited.contains(nextTitle))
                                 break;
                             nextPage = const_cast<FakeNode *>(tree->findFakeNodeByTitle(nextTitle));
+                            visited.insert(nextTitle);
                         }
                         break;
                     }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 0ff28af..114db26 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -79,9 +79,9 @@ QString HtmlGenerator::sinceTitles[] =
         "    New Properties",
         "    New Variables",
         "    New QML Elements",
-        "    New Qml Properties",
-        "    New Qml Signals",
-        "    New Qml Methods",
+        "    New QML Properties",
+        "    New QML Signals",
+        "    New QML Methods",
         ""
     };
 
@@ -401,6 +401,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
 
     switch (atom->type()) {
     case Atom::AbstractLeft:
+        if (relative)
+            relative->doc().location().warning(tr("\abstract is not implemented."));
+        else
+            Location::information(tr("\abstract is not implemented."));
         break;
     case Atom::AbstractRight:
         break;
@@ -476,6 +480,17 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
         break;
+    case Atom::CaptionLeft:
+        out() << "<p class=\"figCaption\">";
+        in_para = true;
+        break;
+    case Atom::CaptionRight:
+        endLink();
+        if (in_para) {
+            out() << "</p>\n";
+            in_para = false;
+        }
+        break;
     case Atom::Code:
         out() << "<pre class=\"cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
@@ -511,12 +526,14 @@ int HtmlGenerator::generateAtom(const Atom *atom,
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
               << "</pre>\n";
         break;
-    case Atom::Div:
+    case Atom::DivLeft:
         out() << "<div";
         if (!atom->string().isEmpty())
-            out() << " class=\"" << atom->string() << "\">";
-        else
-            out() << ">";
+            out() << " " << atom->string();
+        out() << ">";
+        break;
+    case Atom::DivRight:
+        out() << "</div>";
         break;
     case Atom::FootnoteLeft:
         // ### For now
@@ -535,7 +552,11 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     case Atom::FormatIf:
         break;
     case Atom::FormattingLeft:
-        out() << formattingLeftMap()[atom->string()];
+        if (atom->string().startsWith("span ")) {
+            out() << "<" + atom->string() << ">";
+        }
+        else
+            out() << formattingLeftMap()[atom->string()];
         if (atom->string() == ATOM_FORMATTING_PARAMETER) {
             if (atom->next() != 0 && atom->next()->type() == Atom::String) {
                 QRegExp subscriptRegExp("([a-z]+)_([0-9n])");
@@ -551,6 +572,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         if (atom->string() == ATOM_FORMATTING_LINK) {
             endLink();
         }
+        else if (atom->string().startsWith("span ")) {
+            out() << "</span>";
+        }
         else {
             out() << formattingRightMap()[atom->string()];
         }
@@ -891,9 +915,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             if (threeColumnEnumValueTable) {
                 out() << "<table class=\"valuelist\">";
                 if (++numTableRows % 2 == 1)
-                        out() << "<tr class=\"odd\">";
+                        out() << "<tr valign=\"top\" class=\"odd\">";
                 else
-                        out() << "<tr class=\"even\">";
+                        out() << "<tr valign=\"top\" class=\"even\">";
 
                 out() << "<th class=\"tblConst\">Constant</th>"
                       << "<th class=\"tblval\">Value</th>"
@@ -935,10 +959,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else { // (atom->string() == ATOM_LIST_VALUE)
             // ### Trenton
 
-            out() << "<tr><td  class=\"topAlign\"><tt>"
+            out() << "<tr><td class=\"topAlign\"><tt>"
                   << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                  relative)))
-                  << "</tt></td><td class=\" topAlign\">";
+                  << "</tt></td><td class=\"topAlign\">";
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -964,7 +988,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             if (threeColumnEnumValueTable) {
-                out() << "</td><td  class=\"topAlign\">";
+                out() << "</td><td class=\"topAlign\">";
                 if (matchAhead(atom, Atom::ListItemRight))
                     out() << "&nbsp;";
             }
@@ -1056,8 +1080,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             in_para = false;
         }
         if (!atom->string().isEmpty()) {
-            if (atom->string().contains("%"))
-                out() << "<table class=\"generic\">\n "; // width=\"" << atom->string() << "\">\n ";
+            if (atom->string().contains("%")) {
+                out() << "<table class=\"generic\" width=\""
+                      << atom->string() << "\">\n ";
+            }
             else {
                 out() << "<table class=\"generic\">\n";
             }
@@ -1071,14 +1097,14 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "</table>\n";
         break;
     case Atom::TableHeaderLeft:
-        out() << "<thead><tr class=\"qt-style topAlign\">";
+        out() << "<thead><tr class=\"qt-style\">";
         inTableHeader = true;
         break;
     case Atom::TableHeaderRight:
         out() << "</tr>";
         if (matchAhead(atom, Atom::TableHeaderLeft)) {
             skipAhead = 1;
-            out() << "\n<tr class=\"qt-style topAlign\">";
+            out() << "\n<tr class=\"qt-style\">";
         }
         else {
             out() << "</thead>\n";
@@ -1086,10 +1112,12 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         break;
     case Atom::TableRowLeft:
-        if (++numTableRows % 2 == 1)
-            out() << "<tr class=\"odd topAlign\">";
+        if (!atom->string().isEmpty())
+            out() << "<tr " << atom->string() << ">";
+        else if (++numTableRows % 2 == 1)
+            out() << "<tr valign=\"top\" class=\"odd\">";
         else
-            out() << "<tr class=\"even topAlign\">";
+            out() << "<tr valign=\"top\" class=\"even\">";
         break;
     case Atom::TableRowRight:
         out() << "</tr>\n";
@@ -1101,16 +1129,28 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             else
                 out() << "<td ";
 
-            QStringList spans = atom->string().split(",");
-            if (spans.size() == 2) {
-                if (spans.at(0) != "1")
-                    out() << " colspan=\"" << spans.at(0) << "\"";
-                if (spans.at(1) != "1")
-                    out() << " rowspan=\"" << spans.at(1) << "\"";
+            for (int i=0; i<atom->count(); ++i) {
+                if (i > 0)
+                    out() << " ";
+                QString p = atom->string(i);
+                if (p.contains('=')) {
+                    out() << p;
+                }
+                else {
+                    QStringList spans = p.split(",");
+                    if (spans.size() == 2) {
+                        if (spans.at(0) != "1")
+                            out() << " colspan=\"" << spans.at(0) << "\"";
+                        if (spans.at(1) != "1")
+                            out() << " rowspan=\"" << spans.at(1) << "\"";
+                    }
+                }
+            }
             if (inTableHeader)
                 out() << ">";
-            else
-                out() << "><p>"; 
+            else {
+                out() << ">"; 
+                //out() << "><p>"; 
             }
             if (matchAhead(atom, Atom::ParaLeft))
                 skipAhead = 1;
@@ -1119,8 +1159,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     case Atom::TableItemRight:
         if (inTableHeader)
             out() << "</th>";
-        else
-            out() << "</p></td>";
+        else {
+            out() << "</td>";
+            //out() << "</p></td>";
+        }
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
         break;
@@ -1136,9 +1178,6 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<b class=\"redFont\"><code>\\" << protectEnc(atom->string())
               << "</code></b>";
         break;
-    case Atom::EndDiv:
-        out() << "</div>";
-        break;
 #ifdef QDOC_QML
     case Atom::QmlText:
     case Atom::EndQmlText:
@@ -1288,6 +1327,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         generateBody(inner, marker);
         out() << "</div>\n"; // QTBUG-9504
         generateAlsoList(inner, marker);
+        generateMaintainerList(inner, marker);
         generateExtractionMark(inner, EndMark);
     }
 
@@ -1556,75 +1596,125 @@ QString HtmlGenerator::fileExtension(const Node * /* node */) const
 /*!
   Output breadcrumb list in the html file.
  */
-void HtmlGenerator::generateBreadCrumbs(const QString& title,
+void HtmlGenerator::generateBreadCrumbs(const QString &title,
                                         const Node *node,
                                         CodeMarker *marker)
 {
-    Text breadcrumb;
+    Text breadcrumbs;
+
     if (node->type() == Node::Class) {
-        const ClassNode* cn = static_cast<const ClassNode*>(node);
+        const ClassNode *cn = static_cast<const ClassNode *>(node);
         QString name =  node->moduleName();
-        out() << "              <li><a href=\"modules.html\">Modules</a></li>";
-        if (!name.isEmpty()) {
-            out() << "              <li>";
-            breadcrumb << Atom(Atom::AutoLink,name);
-            generateText(breadcrumb, node, marker);
-            out() << "</li>\n";
-        }
+        breadcrumbs << Atom(Atom::ListItemLeft)
+                    << Atom(Atom::Link, QLatin1String("All Modules"))
+                    << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                    << Atom(Atom::String, QLatin1String("Modules"))
+                    << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                    << Atom(Atom::ListItemRight);
+        if (!name.isEmpty())
+            breadcrumbs << Atom(Atom::ListItemLeft)
+                        << Atom(Atom::AutoLink, name)
+                        << Atom(Atom::ListItemRight);
         if (!cn->name().isEmpty())
-            out() << "              <li>" << protectEnc(cn->name()) << "</li>\n";
+            breadcrumbs << Atom(Atom::ListItemLeft)
+                        << Atom(Atom::String, protectEnc(cn->name()))
+                        << Atom(Atom::ListItemRight);
     }
     else if (node->type() == Node::Fake) {
         const FakeNode* fn = static_cast<const FakeNode*>(node);
         if (node->subType() == Node::Module) {
-            out() << "              <li><a href=\"modules.html\">Modules</a></li>";
+            breadcrumbs << Atom(Atom::ListItemLeft)
+                        << Atom(Atom::Link, QLatin1String("All Modules"))
+                        << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                        << Atom(Atom::String, QLatin1String("Modules"))
+                        << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                        << Atom(Atom::ListItemRight);
             QString name =  node->name();
             if (!name.isEmpty())
-                out() << "              <li>" << protectEnc(name) << "</li>\n";
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::String, protectEnc(name))
+                            << Atom(Atom::ListItemRight);
         }
         else if (node->subType() == Node::Group) {
             if (fn->name() == QString("modules"))
-                out() << "              <li>Modules</li>";
-            else {
-                out() << "              <li>" << protectEnc(title) << "</li>";
-            }
+                breadcrumbs << Atom(Atom::String, QLatin1String("Modules"));
+            else
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::String, protectEnc(title))
+                            << Atom(Atom::ListItemRight);
         }
         else if (node->subType() == Node::Page) {
             if (fn->name() == QString("qdeclarativeexamples.html")) {
-                out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
-                out() << "              <li>QML Examples &amp; Demos</li>";
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::Link, QLatin1String("Qt Examples"))
+                            << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                            << Atom(Atom::String, QLatin1String("Examples"))
+                            << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                            << Atom(Atom::ListItemRight);
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::AutoLink, QLatin1String("QML Examples & Demos"))
+                            << Atom(Atom::ListItemRight);
             }
             else if (fn->name().startsWith("examples-")) {
-                out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
-                out() << "              <li>" << protectEnc(title) << "</li>";
-            }
-            else if (fn->name() == QString("namespaces.html")) {
-                out() << "              <li>Namespaces</li>";
-            }
-            else {
-                out() << "              <li>" << protectEnc(title) << "</li>";
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::Link, QLatin1String("Qt Examples"))
+                            << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                            << Atom(Atom::String, QLatin1String("Examples"))
+                            << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                            << Atom(Atom::ListItemRight);
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::String, protectEnc(title))
+                            << Atom(Atom::ListItemRight);
             }
+            else if (fn->name() == QString("namespaces.html"))
+                breadcrumbs << Atom(Atom::String, QLatin1String("Namespaces"));
+            else
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::String, protectEnc(title))
+                            << Atom(Atom::ListItemRight);
         }
         else if (node->subType() == Node::QmlClass) {
-            out() << "              <li><a href=\"qdeclarativeelements.html\">QML Elements</a></li>";
-            out() << "              <li>" << protectEnc(title) << "</li>";
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::AutoLink, QLatin1String("QML Elements"))
+                            << Atom(Atom::ListItemRight);
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::String, protectEnc(title))
+                            << Atom(Atom::ListItemRight);
         }
         else if (node->subType() == Node::Example) {
-            out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
+            breadcrumbs << Atom(Atom::ListItemLeft)
+                        << Atom(Atom::Link, QLatin1String("Qt Examples"))
+                        << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                        << Atom(Atom::String, QLatin1String("Examples"))
+                        << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                        << Atom(Atom::ListItemRight);
             QStringList sl = fn->name().split('/');
             if (sl.contains("declarative"))
-                out() << "              <li><a href=\"qdeclarativeexamples.html\">QML Examples &amp; Demos</a></li>";
+                breadcrumbs << Atom(Atom::ListItemLeft)
+                            << Atom(Atom::AutoLink, QLatin1String("QML Examples & Demos"))
+                            << Atom(Atom::ListItemRight);
             else {
                 QString name = protectEnc("examples-" + sl.at(0) + ".html"); // this generates an empty link
                 QString t = CodeParser::titleFromName(name);
             }
-            out() << "              <li>" << protectEnc(title) << "</li>";
+            breadcrumbs << Atom(Atom::ListItemLeft)
+                        << Atom(Atom::String, protectEnc(title))
+                        << Atom(Atom::ListItemRight);
         }
     }
     else if (node->type() == Node::Namespace) {
-        out() << "              <li><a href=\"namespaces.html\">Namespaces</a></li>";
-        out() << "              <li>" << protectEnc(title) << "</li>";
+        breadcrumbs << Atom(Atom::ListItemLeft)
+                    << Atom(Atom::Link, QLatin1String("All Namespaces"))
+                    << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+                    << Atom(Atom::String, QLatin1String("Namespaces"))
+                    << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
+                    << Atom(Atom::ListItemRight);
+        breadcrumbs << Atom(Atom::ListItemLeft)
+                    << Atom(Atom::String, protectEnc(title))
+                    << Atom(Atom::ListItemRight);
     }
+
+    generateText(breadcrumbs, node, marker);
 }
 
 void HtmlGenerator::generateHeader(const QString& title,
@@ -2571,7 +2661,7 @@ void HtmlGenerator::generateSection(const NodeList& nl,
         else {
             if (twoColumn)
                 out() << "<table class=\"propsummary\">\n"
-                      << "<tr><td  class=\"topAlign\">";
+                      << "<tr><td class=\"topAlign\">";
             out() << "<ul>\n";
         }
 
@@ -2588,7 +2678,7 @@ void HtmlGenerator::generateSection(const NodeList& nl,
             }
             else {
                 if (twoColumn && i == (int) (nl.count() + 1) / 2)
-                    out() << "</ul></td><td  class=\"topAlign\"><ul>\n";
+                    out() << "</ul></td><td class=\"topAlign\"><ul>\n";
                 out() << "<li class=\"fn\">";
             }
 
@@ -2632,7 +2722,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         else {
             if (twoColumn)
                 out() << "<table class=\"propsummary\">\n"
-                      << "<tr><td  class=\"topAlign\">";
+                      << "<tr><td class=\"topAlign\">";
             out() << "<ul>\n";
         }
 
@@ -3833,9 +3923,9 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
             if ((*p)->type() == Node::QmlProperty) {
                 qpn = static_cast<const QmlPropertyNode*>(*p);
                 if (++numTableRows % 2 == 1)
-                    out() << "<tr class=\"odd\">";
+                    out() << "<tr valign=\"top\" class=\"odd\">";
                 else
-                    out() << "<tr class=\"even\">";
+                    out() << "<tr valign=\"top\" class=\"even\">";
 
                 out() << "<td class=\"tblQmlPropNode\"><p>";
 
@@ -3860,9 +3950,9 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         out() << "<table class=\"qmlname\">";
         //out() << "<tr>";
         if (++numTableRows % 2 == 1)
-            out() << "<tr class=\"odd\">";
+            out() << "<tr valign=\"top\" class=\"odd\">";
         else
-            out() << "<tr class=\"even\">";
+            out() << "<tr valign=\"top\" class=\"even\">";
         out() << "<td class=\"tblQmlFuncNode\"><p>";
         out() << "<a name=\"" + refForNode(qsn) + "\"></a>";
         generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
@@ -3877,9 +3967,9 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         out() << "<table class=\"qmlname\">";
         //out() << "<tr>";
         if (++numTableRows % 2 == 1)
-            out() << "<tr class=\"odd\">";
+            out() << "<tr valign=\"top\" class=\"odd\">";
         else
-            out() << "<tr class=\"even\">";
+            out() << "<tr valign=\"top\" class=\"even\">";
         out() << "<td class=\"tblQmlFuncNode\"><p>";
         out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
         generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
diff --git a/tools/qdoc3/jscodemarker.cpp b/tools/qdoc3/jscodemarker.cpp
index e0b7c50..55835be 100644
--- a/tools/qdoc3/jscodemarker.cpp
+++ b/tools/qdoc3/jscodemarker.cpp
@@ -43,11 +43,11 @@
   jscodemarker.cpp
 */
 
-#include "private/qdeclarativejsast_p.h"
-#include "private/qdeclarativejsengine_p.h"
-#include "private/qdeclarativejslexer_p.h"
-#include "private/qdeclarativejsnodepool_p.h"
-#include "private/qdeclarativejsparser_p.h"
+#include "declarativeparser/qdeclarativejsast_p.h"
+#include "declarativeparser/qdeclarativejsengine_p.h"
+#include "declarativeparser/qdeclarativejslexer_p.h"
+#include "declarativeparser/qdeclarativejsnodepool_p.h"
+#include "declarativeparser/qdeclarativejsparser_p.h"
 
 #include "atom.h"
 #include "node.h"
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 7eb8067..52715a3 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -235,6 +235,26 @@ static void processQdocconfFile(const QString &fileName)
     QStringList indexFiles = config.getStringList(CONFIG_INDEXES);
     tree->readIndexes(indexFiles);
 
+#if 0
+    /*
+      I think we won't beusing this...
+
+      Read the list of DITA excluded directories.
+     */
+    QSet<QString> ditaExcludedDirs;
+    QStringList ditaExcludedDirsList = config.getStringList("dita.metadata.excludedirs");
+    foreach (const QString &t, ditaExcludedDirsList)
+        ditaExcludedDirs.insert(QDir::fromNativeSeparators(t));
+
+    if (!ditaExcludedDirs.isEmpty()) {
+        QSet<QString>::iterator i = ditaExcludedDirs.begin();
+        while (i != ditaExcludedDirs.end()) {
+            qDebug() << "DITA EXCLUDED DIR:" << (*i);
+            ++i;
+        }
+    }
+#endif
+
     /*
       Read the list of excluded directories.
      */
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 7195322..ee050f5 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -947,10 +947,35 @@ void ClassNode::fixBaseClasses()
   Search the child list to find the property node with the
   specified \a name.
  */
-const PropertyNode* ClassNode::findPropertyNode(const QString& name) const
+const PropertyNode *ClassNode::findPropertyNode(const QString &name) const
 {
-    const Node* n = findNode(name,Node::Property);
-    return (n ? static_cast<const PropertyNode*>(n) : 0);
+    const Node *n = findNode(name, Node::Property);
+
+    if (n)
+        return static_cast<const PropertyNode*>(n);
+
+    const PropertyNode *pn = 0;
+
+    const QList<RelatedClass> &bases = baseClasses();
+    if (!bases.isEmpty()) {
+        for (int i = 0; i < bases.size(); ++i) {
+            const ClassNode *cn = bases[i].node;
+            pn = cn->findPropertyNode(name);
+            if (pn)
+                break;
+        }
+    }
+    const QList<RelatedClass>& ignoredBases = ignoredBaseClasses();
+    if (!ignoredBases.isEmpty()) {
+        for (int i = 0; i < ignoredBases.size(); ++i) {
+            const ClassNode *cn = ignoredBases[i].node;
+            pn = cn->findPropertyNode(name);
+            if (pn)
+                break;
+        }
+    }
+
+    return pn;
 }
 
 /*!
@@ -1406,6 +1431,7 @@ PropertyNode::PropertyNode(InnerNode *parent, const QString& name)
       usr(Trool_Default),
       cst(false),
       fnl(false),
+      rev(-1),
       overrides(0)
 {
     // nothing.
@@ -1657,7 +1683,7 @@ bool QmlPropertyNode::fromTrool(Trool troolean, bool defaultValue)
     }
 }
 
-static QString valueType(const QString& n)
+static QString valueType(const QString &n)
 {
     if (n == "QPoint")
         return "QDeclarativePointValueType";
@@ -1700,6 +1726,19 @@ bool QmlPropertyNode::isWritable(const Tree* tree) const
     if (wri != Trool_Default)
         return fromTrool(wri, false);
 
+    const PropertyNode *pn = correspondingProperty(tree);
+    if (pn)
+        return pn->isWritable();
+    else {
+        location().warning(tr("Can't determine read-only status of QML property %1; writable assumed.").arg(name()));
+        return true;
+    }
+}
+
+const PropertyNode *QmlPropertyNode::correspondingProperty(const Tree *tree) const
+{
+    const PropertyNode *pn;
+
     Node* n = parent();
     while (n && n->subType() != Node::QmlClass)
         n = n->parent();
@@ -1708,93 +1747,35 @@ bool QmlPropertyNode::isWritable(const Tree* tree) const
         const ClassNode* cn = qcn->classNode();
         if (cn) {
             QStringList dotSplit = name().split(QChar('.'));
-            const PropertyNode* pn = cn->findPropertyNode(dotSplit[0]);
+            pn = cn->findPropertyNode(dotSplit[0]);
             if (pn) {
                 if (dotSplit.size() > 1) {
+                    // Find the C++ property corresponding to the QML property in
+                    // the property group, <group>.<property>.
+
                     QStringList path(extractClassName(pn->qualifiedDataType()));
                     const Node* nn = tree->findNode(path,Class);
                     if (nn) {
                         const ClassNode* cn = static_cast<const ClassNode*>(nn);
-                        pn = cn->findPropertyNode(dotSplit[1]);
-                        if (pn) {
-                            return pn->isWritable();
-                        }
-                        else {
-                            const QList<RelatedClass>& bases = cn->baseClasses();
-                            if (!bases.isEmpty()) {
-                                for (int i=0; i<bases.size(); ++i) {
-                                    const ClassNode* cn = bases[i].node;
-                                    pn = cn->findPropertyNode(dotSplit[1]);
-                                    if (pn) {
-                                        return pn->isWritable();
-                                    }
-                                }
-                            }
-                            const QList<RelatedClass>& ignoredBases = cn->ignoredBaseClasses();
-                            if (!ignoredBases.isEmpty()) {
-                                for (int i=0; i<ignoredBases.size(); ++i) {
-                                    const ClassNode* cn = ignoredBases[i].node;
-                                    pn = cn->findPropertyNode(dotSplit[1]);
-                                    if (pn) {
-                                        return pn->isWritable();
-                                    }
-                                }
-                            }
-                            QString vt = valueType(cn->name());
-                            if (!vt.isEmpty()) {
-                                QStringList path(vt);
-                                const Node* vtn = tree->findNode(path,Class);
-                                if (vtn) {
-                                    const ClassNode* cn = static_cast<const ClassNode*>(vtn);
-                                    pn = cn->findPropertyNode(dotSplit[1]);
-                                    if (pn) {
-                                        return pn->isWritable();
-                                    }
-                                }
-                            }
-                        }
+                        const PropertyNode *pn2 = cn->findPropertyNode(dotSplit[1]);
+                        if (pn2)
+                            return pn2; // Return the property for the QML property.
+                        else
+                            return pn;  // Return the property for the QML group.
                     }
                 }
-                else {
-                    return pn->isWritable();
-                }
+                else
+                    return pn;
             }
             else {
-                const QList<RelatedClass>& bases = cn->baseClasses();
-                if (!bases.isEmpty()) {
-                    for (int i=0; i<bases.size(); ++i) {
-                        const ClassNode* cn = bases[i].node;
-                        pn = cn->findPropertyNode(dotSplit[0]);
-                        if (pn) {
-                            return pn->isWritable();
-                        }
-                    }
-                }
-                const QList<RelatedClass>& ignoredBases = cn->ignoredBaseClasses();
-                if (!ignoredBases.isEmpty()) {
-                    for (int i=0; i<ignoredBases.size(); ++i) {
-                        const ClassNode* cn = ignoredBases[i].node;
-                        pn = cn->findPropertyNode(dotSplit[0]);
-                        if (pn) {
-                            return pn->isWritable();
-                        }
-                    }
-                }
-                if (isAttached()) {
-                    QString classNameAttached = cn->name() + "Attached";
-                    QStringList path(classNameAttached);
-                    const Node* nn = tree->findNode(path,Class);
-                    const ClassNode* acn = static_cast<const ClassNode*>(nn);
-                    pn = acn->findPropertyNode(dotSplit[0]);
-                    if (pn) {
-                        return pn->isWritable();
-                    }
-                }
+                pn = cn->findPropertyNode(dotSplit[0]);
+                if (pn)
+                    return pn;
             }
         }
     }
-    location().warning(tr("Can't determine read-only status of QML property %1; writable assumed.").arg(name()));
-    return true;
+
+    return 0;
 }
 
 #endif
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index aa7c78a..d1123dc 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -466,6 +466,8 @@ class QmlPropertyNode : public LeafNode
     bool isAttached() const { return att; }
     virtual bool isQmlNode() const { return true; }
 
+    const PropertyNode *correspondingProperty(const Tree *tree) const;
+
     const QString& element() const { return static_cast<QmlPropGroupNode*>(parent())->element(); }
 
  private:
@@ -689,6 +691,7 @@ class PropertyNode : public LeafNode
     void setRuntimeScrFunc(const QString& scrf) { runtimeScrFunc = scrf; }
     void setConstant() { cst = true; }
     void setFinal() { fnl = true; }
+    void setRevision(int revision) { rev = revision; }
 
     const QString &dataType() const { return dt; }
     QString qualifiedDataType() const;
@@ -732,6 +735,7 @@ class PropertyNode : public LeafNode
     Trool usr;
     bool cst;
     bool fnl;
+    int rev;
     const PropertyNode* overrides;
 };
 
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 2fedc0f..69d7e28 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -88,15 +88,29 @@ SOURCES += atom.cpp \
 
 INCLUDEPATH += $$QT_BUILD_TREE/include/QtDeclarative
 
-include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
+include(declarativeparser/parser.pri)
 
 ### Documentation for qdoc3 ###
 
 qtPrepareTool(QDOC, qdoc3)
+qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
 
-html-docs.commands = cd \"$$PWD/doc\" && $$QDOC qdoc-manual.qdocconf
+equals(QMAKE_DIR_SEP, /) {
+    QDOC = QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QDOC
+} else {
+    QDOC = set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QDOC
+    QDOC = $$replace(QDOC, "/", "\\")
+}
+
+html-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QDOC $$QT_SOURCE_TREE/tools/qdoc3/doc/config/qdoc.qdocconf
+html-docs.files = $$QT_BUILD_TREE/doc/html
+
+qch-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QHELPGENERATOR $$QT_BUILD_TREE/tools/qdoc3/doc/html/qdoc.qhp -o $$QT_BUILD_TREE/tools/qdoc3/doc/qch/qdoc.qch
+qch-docs.files = $$QT_BUILD_TREE/tools/qdoc3/doc/qch
+qch-docs.path = $$[QT_INSTALL_DOCS]
+qch-docs.CONFIG += no_check_exist directory
 
-QMAKE_EXTRA_TARGETS += html-docs
+QMAKE_EXTRA_TARGETS += html-docs qch-docs
 
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
diff --git a/tools/qdoc3/qmlcodemarker.cpp b/tools/qdoc3/qmlcodemarker.cpp
index bdb2631..29499af 100644
--- a/tools/qdoc3/qmlcodemarker.cpp
+++ b/tools/qdoc3/qmlcodemarker.cpp
@@ -43,12 +43,12 @@
   qmlcodemarker.cpp
 */
 
-#include "private/qdeclarativejsast_p.h"
-#include "private/qdeclarativejsastfwd_p.h"
-#include "private/qdeclarativejsengine_p.h"
-#include "private/qdeclarativejslexer_p.h"
-#include "private/qdeclarativejsnodepool_p.h"
-#include "private/qdeclarativejsparser_p.h"
+#include "declarativeparser/qdeclarativejsast_p.h"
+#include "declarativeparser/qdeclarativejsastfwd_p.h"
+#include "declarativeparser/qdeclarativejsengine_p.h"
+#include "declarativeparser/qdeclarativejslexer_p.h"
+#include "declarativeparser/qdeclarativejsnodepool_p.h"
+#include "declarativeparser/qdeclarativejsparser_p.h"
 
 #include "atom.h"
 #include "node.h"
diff --git a/tools/qdoc3/qmlcodemarker.h b/tools/qdoc3/qmlcodemarker.h
index d693456..aab3455 100644
--- a/tools/qdoc3/qmlcodemarker.h
+++ b/tools/qdoc3/qmlcodemarker.h
@@ -46,7 +46,7 @@
 #ifndef QMLCODEMARKER_H
 #define QMLCODEMARKER_H
 
-#include "private/qdeclarativejsastfwd_p.h"
+#include "declarativeparser/qdeclarativejsastfwd_p.h"
 #include "cppcodemarker.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/tools/qdoc3/qmlcodeparser.cpp b/tools/qdoc3/qmlcodeparser.cpp
index 269a566..9299053 100644
--- a/tools/qdoc3/qmlcodeparser.cpp
+++ b/tools/qdoc3/qmlcodeparser.cpp
@@ -43,9 +43,9 @@
   qmlcodeparser.cpp
 */
 
-#include "private/qdeclarativejsast_p.h"
-#include "private/qdeclarativejsastvisitor_p.h"
-#include "private/qdeclarativejsnodepool_p.h"
+#include "declarativeparser/qdeclarativejsast_p.h"
+#include "declarativeparser/qdeclarativejsastvisitor_p.h"
+#include "declarativeparser/qdeclarativejsnodepool_p.h"
 
 #include "qmlcodeparser.h"
 #include "node.h"
@@ -142,7 +142,7 @@ void QmlCodeParser::doneParsingSourceFiles(Tree *tree)
 }
 
 /*!
-  Returns the set of strings reopresenting the topic commands.
+  Returns the set of strings representing the topic commands.
  */
 QSet<QString> QmlCodeParser::topicCommands()
 {
diff --git a/tools/qdoc3/qmlcodeparser.h b/tools/qdoc3/qmlcodeparser.h
index e5cc0dd..667cf5e 100644
--- a/tools/qdoc3/qmlcodeparser.h
+++ b/tools/qdoc3/qmlcodeparser.h
@@ -47,9 +47,9 @@
 #define QMLCODEPARSER_H
 
 #include <QSet>
-#include "private/qdeclarativejsengine_p.h"
-#include "private/qdeclarativejslexer_p.h"
-#include "private/qdeclarativejsparser_p.h"
+#include "declarativeparser/qdeclarativejsengine_p.h"
+#include "declarativeparser/qdeclarativejslexer_p.h"
+#include "declarativeparser/qdeclarativejsparser_p.h"
 
 #include "codeparser.h"
 #include "location.h"
diff --git a/tools/qdoc3/qmlmarkupvisitor.cpp b/tools/qdoc3/qmlmarkupvisitor.cpp
index f849319..6365c02 100644
--- a/tools/qdoc3/qmlmarkupvisitor.cpp
+++ b/tools/qdoc3/qmlmarkupvisitor.cpp
@@ -41,9 +41,9 @@
 
 #include <QStringList>
 #include <QtGlobal>
-#include "private/qdeclarativejsast_p.h"
-#include "private/qdeclarativejsastfwd_p.h"
-#include "private/qdeclarativejsengine_p.h"
+#include "declarativeparser/qdeclarativejsast_p.h"
+#include "declarativeparser/qdeclarativejsastfwd_p.h"
+#include "declarativeparser/qdeclarativejsengine_p.h"
 
 #include "qmlmarkupvisitor.h"
 
diff --git a/tools/qdoc3/qmlmarkupvisitor.h b/tools/qdoc3/qmlmarkupvisitor.h
index 6cee613..14041a2 100644
--- a/tools/qdoc3/qmlmarkupvisitor.h
+++ b/tools/qdoc3/qmlmarkupvisitor.h
@@ -43,7 +43,7 @@
 #define QMLVISITOR_H
 
 #include <QString>
-#include "private/qdeclarativejsastvisitor_p.h"
+#include "declarativeparser/qdeclarativejsastvisitor_p.h"
 #include "node.h"
 #include "tree.h"
 
diff --git a/tools/qdoc3/qmlvisitor.cpp b/tools/qdoc3/qmlvisitor.cpp
index 7045313..437bd57 100644
--- a/tools/qdoc3/qmlvisitor.cpp
+++ b/tools/qdoc3/qmlvisitor.cpp
@@ -42,9 +42,9 @@
 #include <QFileInfo>
 #include <QStringList>
 #include <QtGlobal>
-#include "private/qdeclarativejsast_p.h"
-#include "private/qdeclarativejsastfwd_p.h"
-#include "private/qdeclarativejsengine_p.h"
+#include "declarativeparser/qdeclarativejsast_p.h"
+#include "declarativeparser/qdeclarativejsastfwd_p.h"
+#include "declarativeparser/qdeclarativejsengine_p.h"
 
 #include "node.h"
 #include "qmlvisitor.h"
diff --git a/tools/qdoc3/qmlvisitor.h b/tools/qdoc3/qmlvisitor.h
index 9da2c72..4771f9e 100644
--- a/tools/qdoc3/qmlvisitor.h
+++ b/tools/qdoc3/qmlvisitor.h
@@ -43,7 +43,7 @@
 #define QMLVISITOR_H
 
 #include <QString>
-#include "private/qdeclarativejsastvisitor_p.h"
+#include "declarativeparser/qdeclarativejsastvisitor_p.h"
 #include "node.h"
 #include "tree.h"
 
diff --git a/tools/qdoc3/quoter.cpp b/tools/qdoc3/quoter.cpp
index dadf67c..d9210e3 100644
--- a/tools/qdoc3/quoter.cpp
+++ b/tools/qdoc3/quoter.cpp
@@ -41,6 +41,7 @@
 
 #include <qfileinfo.h>
 #include <qregexp.h>
+#include <qdebug.h>
 
 #include "quoter.h"
 
@@ -65,7 +66,7 @@ static void replaceMultipleNewlines(QString &s)
 }
 
 // This is equivalent to  line.split( QRegExp("\n(?!\n|$)") ) but much faster
-static QStringList splitLines(const QString &line)
+QStringList Quoter::splitLines(const QString &line)
 {
     QStringList result;
     int i = line.size();
diff --git a/tools/qdoc3/quoter.h b/tools/qdoc3/quoter.h
index 6a59ab4..ee515b2 100644
--- a/tools/qdoc3/quoter.h
+++ b/tools/qdoc3/quoter.h
@@ -69,6 +69,8 @@ public:
 			const QString& pattern );
     QString quoteSnippet(const Location &docLocation, const QString &identifier);
 
+    static QStringList splitLines(const QString &line);
+
 private:
     QString getLine(int unindent = 0);
     void failedAtEnd( const Location& docLocation, const QString& command );
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf
index 2262daa..87e442d 100644
--- a/tools/qdoc3/test/macros.qdocconf
+++ b/tools/qdoc3/test/macros.qdocconf
@@ -29,6 +29,7 @@ macro.begincomment      = "\\c{/*}"
 macro.endcomment        = "\\c{*/}"
 macro.uuml.HTML         = "&uuml;"
 macro.mdash.HTML        = "&mdash;"
+macro.pi.HTML         = "&Pi;"
 
 macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
 macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
index e775228..06cc9a0 100644
--- a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
@@ -96,7 +96,7 @@ excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.css"
 examples.imageextensions = "*.png"
 
 exampledirs             = $QT_SOURCE_TREE/doc/src \
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index d932dfb..1efda05 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -96,7 +96,7 @@ excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.css"
 examples.imageextensions = "*.png"
 
 exampledirs             = $QT_SOURCE_TREE/doc/src \
diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf
index dc84e7d..77ab3c5 100644
--- a/tools/qdoc3/test/qt-html-templates-online.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf
@@ -40,8 +40,7 @@ HTML.postheader = \
     "                        <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
     "                        <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
     "                        <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
-    "                        <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
-    "                        <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+    "                        <li><a href=\"supported-platforms.html\">Supported Platforms</a></li>  \n" \
     "                        <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
     "                        <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
     "              </ul> \n" \
@@ -101,8 +100,7 @@ HTML.postheader = \
     "               <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
     "               <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
     "               <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-    "               <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-    "               <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"supported-platforms.html\">Supported Platforms</a></li>  \n" \
     "               <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
     "               <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
     "            </ul>  \n" \
@@ -196,37 +194,3 @@ HTML.footer = \
     "  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n" \
     "  })();\n" \
     "  </script>\n"
-
-
-# Files not referenced in any qdoc file.
-# See also extraimages.HTML
-qhp.Qt.extraFiles = index.html \
-                    images/bg_l.png \
-                    images/bg_l_blank.png \
-                    images/bg_ll_blank.png \
-                    images/bg_ul_blank.png \
-                    images/header_bg.png \
-                    images/bg_r.png \
-                    images/box_bg.png \
-                    images/breadcrumb.png \
-                    images/bullet_gt.png \
-                    images/bullet_dn.png \
-                    images/bullet_sq.png \
-                    images/bullet_up.png \
-                    images/arrow_down.png \
-                    images/feedbackground.png \
-                    images/horBar.png \
-                    images/page.png \
-                    images/page_bg.png \
-                    images/sprites-combined.png \
-                    images/spinner.gif \
-                    scripts/functions.js \
-                    scripts/jquery.js \
-                    scripts/narrow.js \
-                    scripts/superfish.js \
-                    style/narrow.css \
-                    style/superfish.css \
-                    style/style_ie6.css \
-                    style/style_ie7.css \
-                    style/style_ie8.css \
-                    style/style.css
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 6f756da..8a70f3b 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -52,3 +52,259 @@ qhp.Qt.extraFiles = index.html \
                     images/horBar.png \
                     images/sprites-combined.png \
                     style/offline.css
+
+#QtWebKit Guide files
+qhp.Qt.extraFiles += webkit-guide/anim_accord.htm \
+webkit-guide/anim_demo-rotate.htm \
+webkit-guide/anim_demo-scale.htm \
+webkit-guide/anim_demo-skew.htm \
+webkit-guide/anim_gallery.htm \
+webkit-guide/anim_panel.htm \
+webkit-guide/anim_pulse.htm \
+webkit-guide/anim_skew.htm \
+webkit-guide/anim_slide1.htm \
+webkit-guide/anim_slide2.htm \
+webkit-guide/anim_slide3.htm \
+webkit-guide/anim_tabbedSkew.htm \
+webkit-guide/_copyright.txt \
+webkit-guide/css3_backgrounds.htm \
+webkit-guide/css3_border-img.htm \
+webkit-guide/css3_gradientBack.htm \
+webkit-guide/css3_gradientBackStop.htm \
+webkit-guide/css3_gradientButton.htm \
+webkit-guide/css3_grad-radial.htm \
+webkit-guide/css3_mask-grad.htm \
+webkit-guide/css3_mask-img.htm \
+webkit-guide/css3_multicol.htm \
+webkit-guide/css3_reflect.htm \
+webkit-guide/css3_scroll.htm \
+webkit-guide/css3_sel-nth.htm \
+webkit-guide/css3_shadow.htm \
+webkit-guide/css3_text-overflow.htm \
+webkit-guide/css3_text-shadow.htm \
+webkit-guide/css3_text-stroke.htm \
+webkit-guide/form_tapper.htm \
+webkit-guide/form_toggler.htm \
+webkit-guide/_image_assets.htm \
+webkit-guide/_index.html \
+webkit-guide/layout_link-fmt.htm \
+webkit-guide/layout_tbl-keyhole.htm \
+webkit-guide/mob_condjs.htm \
+webkit-guide/mob_layout.htm \
+webkit-guide/mob_mediaquery.htm \
+webkit-guide/storage.htm \
+webkit-guide/css/anim_accord.css \
+webkit-guide/css/anim_demo-rotate.css \
+webkit-guide/css/anim_demo-scale.css \
+webkit-guide/css/anim_demo-skew.css \
+webkit-guide/css/anim_gallery.css \
+webkit-guide/css/anim_panel.css \
+webkit-guide/css/anim_pulse.css \
+webkit-guide/css/anim_skew.css \
+webkit-guide/css/anim_slide.css \
+webkit-guide/css/anim_tabbedSkew.css \
+webkit-guide/css/css3_backgrounds.css \
+webkit-guide/css/css3_border-img.css \
+webkit-guide/css/css3_gradientBack.css \
+webkit-guide/css/css3_gradientBackStop.css \
+webkit-guide/css/css3_gradientButton.css \
+webkit-guide/css/css3_grad-radial.css \
+webkit-guide/css/css3_mask-grad.css \
+webkit-guide/css/css3_mask-img.css \
+webkit-guide/css/css3_multicol.css \
+webkit-guide/css/css3_reflect.css \
+webkit-guide/css/css3_scroll.css \
+webkit-guide/css/css3_sel-nth.css \
+webkit-guide/css/css3_shadowBlur.css \
+webkit-guide/css/css3_shadow.css \
+webkit-guide/css/css3_text-overflow.css \
+webkit-guide/css/css3_text-shadow.css \
+webkit-guide/css/css3_text-stroke.css \
+webkit-guide/css/form_tapper.css \
+webkit-guide/css/form_toggler.css \
+webkit-guide/css/layout_link-fmt.css \
+webkit-guide/css/layout_tbl-keyhole.css \
+webkit-guide/css/mob_condjs.css \
+webkit-guide/css/mobile.css \
+webkit-guide/css/mob_mediaquery.css \
+webkit-guide/css/mq_desktop.css \
+webkit-guide/css/mqlayout_desktop.css \
+webkit-guide/css/mqlayout_mobile.css \
+webkit-guide/css/mqlayout_touch.css \
+webkit-guide/css/mq_mobile.css \
+webkit-guide/css/mq_touch.css \
+webkit-guide/css/storage.css \
+webkit-guide/img/border-frame.png \
+webkit-guide/img/gal0.png \
+webkit-guide/img/gal1.png \
+webkit-guide/img/gal2.png \
+webkit-guide/img/gal3.png \
+webkit-guide/img/gal4.png \
+webkit-guide/img/gal5.png \
+webkit-guide/img/gal6.png \
+webkit-guide/img/gal7.png \
+webkit-guide/img/gal8.png \
+webkit-guide/img/gradient.jpg \
+webkit-guide/img/gray_icon_close.png \
+webkit-guide/img/ic_ag_016.png \
+webkit-guide/img/ic_ag_032.png \
+webkit-guide/img/ic_ag_036.png \
+webkit-guide/img/ic_ag_048.png \
+webkit-guide/img/ic_al_016.png \
+webkit-guide/img/ic_al_032.png \
+webkit-guide/img/ic_al_036.png \
+webkit-guide/img/ic_al_048.png \
+webkit-guide/img/ic_ar_016.png \
+webkit-guide/img/ic_ar_032.png \
+webkit-guide/img/ic_ar_036.png \
+webkit-guide/img/ic_ar_048.png \
+webkit-guide/img/ic_b_016.png \
+webkit-guide/img/ic_b_032.png \
+webkit-guide/img/ic_b_036.png \
+webkit-guide/img/ic_b_048.png \
+webkit-guide/img/ic_be_016.png \
+webkit-guide/img/ic_be_032.png \
+webkit-guide/img/ic_be_036.png \
+webkit-guide/img/ic_be_048.png \
+webkit-guide/img/ic_c_016.png \
+webkit-guide/img/ic_c_032.png \
+webkit-guide/img/ic_c_036.png \
+webkit-guide/img/ic_c_048.png \
+webkit-guide/img/ic_ca_016.png \
+webkit-guide/img/ic_ca_032.png \
+webkit-guide/img/ic_ca_036.png \
+webkit-guide/img/ic_ca_048.png \
+webkit-guide/img/ic_cl_016.png \
+webkit-guide/img/ic_cl_032.png \
+webkit-guide/img/ic_cl_036.png \
+webkit-guide/img/ic_cl_048.png \
+webkit-guide/img/ic_cu_016.png \
+webkit-guide/img/ic_cu_032.png \
+webkit-guide/img/ic_cu_036.png \
+webkit-guide/img/ic_cu_048.png \
+webkit-guide/img/ic_f_016.png \
+webkit-guide/img/ic_f_032.png \
+webkit-guide/img/ic_f_036.png \
+webkit-guide/img/ic_f_048.png \
+webkit-guide/img/ic_fe_016.png \
+webkit-guide/img/ic_fe_032.png \
+webkit-guide/img/ic_fe_036.png \
+webkit-guide/img/ic_fe_048.png \
+webkit-guide/img/ic_h_016.png \
+webkit-guide/img/ic_h_032.png \
+webkit-guide/img/ic_h_036.png \
+webkit-guide/img/ic_h_048.png \
+webkit-guide/img/ic_he_016.png \
+webkit-guide/img/ic_he_032.png \
+webkit-guide/img/ic_he_036.png \
+webkit-guide/img/ic_he_048.png \
+webkit-guide/img/ic_k_016.png \
+webkit-guide/img/ic_k_032.png \
+webkit-guide/img/ic_k_036.png \
+webkit-guide/img/ic_k_048.png \
+webkit-guide/img/ic_li_016.png \
+webkit-guide/img/ic_li_032.png \
+webkit-guide/img/ic_li_036.png \
+webkit-guide/img/ic_li_048.png \
+webkit-guide/img/ic_mg_016.png \
+webkit-guide/img/ic_mg_032.png \
+webkit-guide/img/ic_mg_036.png \
+webkit-guide/img/ic_mg_048.png \
+webkit-guide/img/ic_n_016.png \
+webkit-guide/img/ic_n_032.png \
+webkit-guide/img/ic_n_036.png \
+webkit-guide/img/ic_n_048.png \
+webkit-guide/img/ic_na_016.png \
+webkit-guide/img/ic_na_032.png \
+webkit-guide/img/ic_na_036.png \
+webkit-guide/img/ic_na_048.png \
+webkit-guide/img/ic_ne_016.png \
+webkit-guide/img/ic_ne_032.png \
+webkit-guide/img/ic_ne_036.png \
+webkit-guide/img/ic_ne_048.png \
+webkit-guide/img/ic_ni_016.png \
+webkit-guide/img/ic_ni_032.png \
+webkit-guide/img/ic_ni_036.png \
+webkit-guide/img/ic_ni_048.png \
+webkit-guide/img/ic_o_016.png \
+webkit-guide/img/ic_o_032.png \
+webkit-guide/img/ic_o_036.png \
+webkit-guide/img/ic_o_048.png \
+webkit-guide/img/icon_check.png \
+webkit-guide/img/icon_check_x24green.png \
+webkit-guide/img/icon_dismiss.png \
+webkit-guide/img/icon_dismiss_x22.png \
+webkit-guide/img/icon_drill-down.png \
+webkit-guide/img/icon_drill-down_x32.png \
+webkit-guide/img/icon_drill-up.png \
+webkit-guide/img/icon_drill-up_x32.png \
+webkit-guide/img/icon_expand-nav.png \
+webkit-guide/img/icon_head-collapsed.png \
+webkit-guide/img/icon_head-collapsed_x13.png \
+webkit-guide/img/icon_head-expanded.png \
+webkit-guide/img/icon_head-expanded_x13.png \
+webkit-guide/img/icon_info.png \
+webkit-guide/img/icon_info_x24.png \
+webkit-guide/img/icon_link-doc.png \
+webkit-guide/img/icon_link-email.png \
+webkit-guide/img/icon_link-external.png \
+webkit-guide/img/icon_link-pdf.png \
+webkit-guide/img/icon_link-ppt.png \
+webkit-guide/img/icon_link-rss.png \
+webkit-guide/img/icon_link-sms.png \
+webkit-guide/img/icon_link-tel.png \
+webkit-guide/img/icon_link-xls.png \
+webkit-guide/img/icon_list-all_circ.png \
+webkit-guide/img/icon_list-all.png \
+webkit-guide/img/icon_nav_end.png \
+webkit-guide/img/icon_nav-start.png \
+webkit-guide/img/icon_nav-top.png \
+webkit-guide/img/icon_nav-up.png \
+webkit-guide/img/icon_question.png \
+webkit-guide/img/icon_scroll-left.png \
+webkit-guide/img/icon_scroll-right.png \
+webkit-guide/img/icon_trash.png \
+webkit-guide/img/ic_pt_016.png \
+webkit-guide/img/ic_pt_032.png \
+webkit-guide/img/ic_pt_036.png \
+webkit-guide/img/ic_pt_048.png \
+webkit-guide/img/ic_si_016.png \
+webkit-guide/img/ic_si_032.png \
+webkit-guide/img/ic_si_036.png \
+webkit-guide/img/ic_si_048.png \
+webkit-guide/img/ic_zn_016.png \
+webkit-guide/img/ic_zn_032.png \
+webkit-guide/img/ic_zn_036.png \
+webkit-guide/img/ic_zn_048.png \
+webkit-guide/img/land1.png \
+webkit-guide/img/land2.png \
+webkit-guide/img/land3.png \
+webkit-guide/img/land4.png \
+webkit-guide/img/land5.png \
+webkit-guide/img/land6.png \
+webkit-guide/img/land7.png \
+webkit-guide/img/land8.png \
+webkit-guide/img/mask.png \
+webkit-guide/img/tnail_gal1.png \
+webkit-guide/img/tnail_gal2.png \
+webkit-guide/img/tnail_gal3.png \
+webkit-guide/img/tnail_gal4.png \
+webkit-guide/img/tnail_gal5.png \
+webkit-guide/img/tnail_gal6.png \
+webkit-guide/img/tnail_gal7.png \
+webkit-guide/img/tnail_gal8.png \
+webkit-guide/js/anim_accord.js \
+webkit-guide/js/anim_gallery.js \
+webkit-guide/js/anim_panel.js \
+webkit-guide/js/anim_skew.js \
+webkit-guide/js/css3_backgrounds.js \
+webkit-guide/js/css3_border-img.js \
+webkit-guide/js/css3_grad-radial.js \
+webkit-guide/js/css3_mask-grad.js \
+webkit-guide/js/css3_mask-img.js \
+webkit-guide/js/css3_text-overflow.js \
+webkit-guide/js/form_tapper.js \
+webkit-guide/js/mob_condjs.js \
+webkit-guide/js/mobile.js \
+webkit-guide/js/storage.js \
+
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
index 2da0e90..d03dfd2 100644
--- a/tools/qdoc3/test/qt-project.qdocconf
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -35,6 +35,13 @@ qhp.Qt.subprojects.examples.title = Tutorials and Examples
 qhp.Qt.subprojects.examples.indexTitle = Qt Examples
 qhp.Qt.subprojects.examples.selectors = fake:example
 
+dita.metadata.default.author      = Qt Development Frameworks
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher   = Nokia
+dita.metadata.default.copyryear = 2011
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
 language                = Cpp
 
 headerdirs              = $QT_SOURCE_TREE/src \
@@ -90,7 +97,7 @@ excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
 sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
 headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
 
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
 examples.imageextensions = "*.png"
 
 exampledirs             = $QT_SOURCE_TREE/doc/src \
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index ce0a1bd..edd6b04 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -51,6 +51,7 @@
 #include <QMessageBox>
 #include <QAtomicInt>
 #include "qdeclarativetester.h"
+#include <private/qdeclarativedebughelper_p.h>
 
 QT_USE_NAMESPACE
 
@@ -537,6 +538,8 @@ int main(int argc, char ** argv)
         QApplication::setGraphicsSystem("raster");
 #endif
 
+    QDeclarativeDebugHelper::enableDebugging();
+
     Application app(argc, argv);
     app.setApplicationName("QtQmlViewer");
     app.setOrganizationName("Nokia");
diff --git a/tools/qtconfig/paletteeditoradvanced.ui b/tools/qtconfig/paletteeditoradvanced.ui
index b1d6b95..0b4ae66 100644
--- a/tools/qtconfig/paletteeditoradvanced.ui
+++ b/tools/qtconfig/paletteeditoradvanced.ui
@@ -2,7 +2,7 @@
 <ui version="4.0">
   <comment>*********************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tools/qtconfig/previewwidget.ui b/tools/qtconfig/previewwidget.ui
index 2e0789f..fac4b6c 100644
--- a/tools/qtconfig/previewwidget.ui
+++ b/tools/qtconfig/previewwidget.ui
@@ -2,7 +2,7 @@
 <ui version="4.0">
  <comment>*********************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri
new file mode 100644
index 0000000..1755448
--- /dev/null
+++ b/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri
@@ -0,0 +1,4 @@
+INCLUDEPATH += $$PWD
+DEPENDPATH += $$PWD
+SOURCES += $$PWD/qtpropertybrowserutils.cpp
+HEADERS += $$PWD/qtpropertybrowserutils_p.h