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

21 files changed, 453 insertions, 479 deletions

diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index b3dc31a..585d6ce 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -955,7 +955,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
 		ident += ch;
                 finish = i;
 		readChar();
-	    } while (isalnum(ch) || ch == '_');
+            } while (ch >= 0 && isalnum(ch) || ch == '_');
 
 	    if (classRegExp.exactMatch(ident)) {
 		tag = QLatin1String("type");
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index b801e1e..ae7385e 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -62,25 +62,6 @@ QT_BEGIN_NAMESPACE
 #define COMMAND_VERSION                         Doc::alias("version")
 int DitaXmlGenerator::id = 0;
 
-QString DitaXmlGenerator::sinceTitles[] =
-    {
-        "    New Namespaces",
-        "    New Classes",
-        "    New Member Functions",
-        "    New Functions in Namespaces",
-        "    New Global Functions",
-        "    New Macros",
-        "    New Enum Types",
-        "    New Typedefs",
-        "    New Properties",
-        "    New Variables",
-        "    New QML Elements",
-        "    New Qml Properties",
-        "    New Qml Signals",
-        "    New Qml Methods",
-        ""
-    };
-
 /*
   The strings in this array must appear in the same order as
   the values in enum DitaXmlGenerator::DitaTag.
@@ -3952,70 +3933,6 @@ void DitaXmlGenerator::findAllClasses(const InnerNode* node)
     }
 }
 
-/*!
-  For generating the "New Classes... in 4.x" section on the
-  What's New in 4.x" page.
- */
-void DitaXmlGenerator::findAllSince(const InnerNode* node)
-{
-    NodeList::const_iterator child = node->childNodes().constBegin();
-    while (child != node->childNodes().constEnd()) {
-        QString sinceVersion = (*child)->since();
-        if (((*child)->access() != Node::Private) && !sinceVersion.isEmpty()) {
-            NewSinceMaps::iterator nsmap = newSinceMaps.find(sinceVersion);
-            if (nsmap == newSinceMaps.end())
-                nsmap = newSinceMaps.insert(sinceVersion,NodeMultiMap());
-            NewClassMaps::iterator ncmap = newClassMaps.find(sinceVersion);
-            if (ncmap == newClassMaps.end())
-                ncmap = newClassMaps.insert(sinceVersion,NodeMap());
-            NewClassMaps::iterator nqcmap = newQmlClassMaps.find(sinceVersion);
-            if (nqcmap == newQmlClassMaps.end())
-                nqcmap = newQmlClassMaps.insert(sinceVersion,NodeMap());
- 
-            if ((*child)->type() == Node::Function) {
-                FunctionNode *func = static_cast<FunctionNode *>(*child);
-                if ((func->status() > Node::Obsolete) &&
-                    (func->metaness() != FunctionNode::Ctor) &&
-                    (func->metaness() != FunctionNode::Dtor)) {
-                    nsmap.value().insert(func->name(),(*child));
-                }
-            }
-            else if ((*child)->url().isEmpty()) {
-                if ((*child)->type() == Node::Class && !(*child)->doc().isEmpty()) {
-                    QString className = (*child)->name();
-                    if ((*child)->parent() &&
-                        (*child)->parent()->type() == Node::Namespace &&
-                        !(*child)->parent()->name().isEmpty())
-                        className = (*child)->parent()->name()+"::"+className;
-                    nsmap.value().insert(className,(*child));
-                    ncmap.value().insert(className,(*child));
-                }
-                else if ((*child)->subType() == Node::QmlClass) {
-                    QString className = (*child)->name();
-                    if ((*child)->parent() &&
-                        (*child)->parent()->type() == Node::Namespace &&
-                        !(*child)->parent()->name().isEmpty())
-                        className = (*child)->parent()->name()+"::"+className;
-                    nsmap.value().insert(className,(*child));
-                    nqcmap.value().insert(className,(*child));
-                }
-            }
-            else {
-                QString name = (*child)->name();
-                if ((*child)->parent() &&
-                    (*child)->parent()->type() == Node::Namespace &&
-                    !(*child)->parent()->name().isEmpty())
-                    name = (*child)->parent()->name()+"::"+name;
-                nsmap.value().insert(name,(*child));
-            }
-            if ((*child)->isInnerNode()) {
-                findAllSince(static_cast<InnerNode *>(*child));
-            }
-        }
-        ++child;
-    }
-}
-
 void DitaXmlGenerator::findAllFunctions(const InnerNode* node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 408f46c..d8d3563 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -51,12 +51,6 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QMultiMap<QString, Node*> NodeMultiMap;
-typedef QMap<QString, NodeMultiMap> NewSinceMaps;
-typedef QMap<Node*, NodeMultiMap> ParentMaps;
-typedef QMap<QString, const Node*> NodeMap;
-typedef QMap<QString, NodeMap> NewClassMaps;
-
 typedef QMap<QString, QString> GuidMap;
 typedef QMap<QString, GuidMap*> GuidMaps;
 
@@ -418,7 +412,6 @@ class DitaXmlGenerator : public PageGenerator
     void findAllFunctions(const InnerNode *node);
     void findAllLegaleseTexts(const InnerNode *node);
     void findAllNamespaces(const InnerNode *node);
-    void findAllSince(const InnerNode *node);
     static int hOffset(const Node *node);
     static bool isThreeColumnEnumValueTable(const Atom *atom);
     virtual QString getLink(const Atom *atom, 
@@ -515,10 +508,6 @@ class DitaXmlGenerator : public PageGenerator
 #endif
     QMap<QString, NodeMap > funcIndex;
     QMap<Text, const Node*> legaleseTexts;
-    NewSinceMaps newSinceMaps;
-    static QString sinceTitles[];
-    NewClassMaps newClassMaps;
-    NewClassMaps newQmlClassMaps;
     static int id;
     static QString ditaTags[];
     QStack<QXmlStreamWriter*> xmlWriterStack;
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 479931d..37f68f8 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -828,7 +828,7 @@ void DocParser::parse(const QString& source,
                         append(Atom::AnnotatedList, getArgument());
                         break;
                     case CMD_SINCELIST:
-                        append(Atom::SinceList, getArgument());
+                        append(Atom::SinceList, getRestOfLine().simplified());
                         break;
                     case CMD_GENERATELIST:
                         append(Atom::GeneratedList, getArgument());
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 3367301..c20d2b4 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -77,6 +77,25 @@ QString Generator::outDir;
 QString Generator::project;
 QHash<QString, QString> Generator::outputPrefixes;
 
+QString Generator::sinceTitles[] =
+    {
+        "    New Namespaces",
+        "    New Classes",
+        "    New Member Functions",
+        "    New Functions in Namespaces",
+        "    New Global Functions",
+        "    New Macros",
+        "    New Enum Types",
+        "    New Typedefs",
+        "    New Properties",
+        "    New Variables",
+        "    New QML Elements",
+        "    New QML Properties",
+        "    New QML Signals",
+        "    New QML Methods",
+        ""
+    };
+
 static void singularPlural(Text& text, const NodeList& nodes)
 {
     if (nodes.count() == 1)
@@ -760,8 +779,18 @@ QString Generator::typeString(const Node *node)
     case Node::Class:
         return "class";
     case Node::Fake:
-    default:
-        return "documentation";
+    {
+        switch (node->subType()) {
+        case Node::QmlClass:
+            return "element";
+        case Node::QmlPropertyGroup:
+            return "property group";
+        case Node::QmlBasicType:
+            return "type";
+        default:
+            return "documentation";
+        }
+    }
     case Node::Enum:
         return "enum";
     case Node::Typedef:
@@ -770,6 +799,8 @@ QString Generator::typeString(const Node *node)
         return "function";
     case Node::Property:
         return "property";
+    default:
+        return "documentation";
     }
 }
 
@@ -1091,11 +1122,21 @@ void Generator::generateSince(const Node *node, CodeMarker *marker)
             text << " was introduced or modified in ";
         else
             text << " was introduced in ";
-        if (project.isEmpty())
-             text << "version";
-        else
-             text << project;
-        text << " " << node->since() << "." << Atom::ParaRight;
+
+        QStringList since = node->since().split(" ");
+        if (since.count() == 1) {
+            // Handle legacy use of \since <version>.
+            if (project.isEmpty())
+                 text << "version";
+            else
+                 text << project;
+            text << " " << since[0];
+        } else {
+            // Reconstruct the <project> <version> string.
+            text << " " << since.join(" ");
+        }
+
+        text << "." << Atom::ParaRight;
         generateText(text, node, marker);
     }
 }
@@ -1346,4 +1387,91 @@ QStringList Generator::getMetadataElements(const InnerNode* inner, const QString
     return s;
 }
 
+/*!
+  For generating the "New Classes... in 4.6" section on the
+  What's New in 4.6" page.
+ */
+void Generator::findAllSince(const InnerNode *node)
+{
+    NodeList::const_iterator child = node->childNodes().constBegin();
+
+    // Traverse the tree, starting at the node supplied.
+
+    while (child != node->childNodes().constEnd()) {
+
+        QString sinceString = (*child)->since();
+
+        if (((*child)->access() != Node::Private) && !sinceString.isEmpty()) {
+
+            // Insert a new entry into each map for each new since string found.
+            NewSinceMaps::iterator nsmap = newSinceMaps.find(sinceString);
+            if (nsmap == newSinceMaps.end())
+                nsmap = newSinceMaps.insert(sinceString,NodeMultiMap());
+
+            NewClassMaps::iterator ncmap = newClassMaps.find(sinceString);
+            if (ncmap == newClassMaps.end())
+                ncmap = newClassMaps.insert(sinceString,NodeMap());
+
+            NewClassMaps::iterator nqcmap = newQmlClassMaps.find(sinceString);
+            if (nqcmap == newQmlClassMaps.end())
+                nqcmap = newQmlClassMaps.insert(sinceString,NodeMap());
+
+            if ((*child)->type() == Node::Function) {
+                // Insert functions into the general since map.
+                FunctionNode *func = static_cast<FunctionNode *>(*child);
+                if ((func->status() > Node::Obsolete) &&
+                    (func->metaness() != FunctionNode::Ctor) &&
+                    (func->metaness() != FunctionNode::Dtor)) {
+                    nsmap.value().insert(func->name(),(*child));
+                }
+            }
+            else if ((*child)->url().isEmpty()) {
+                if ((*child)->type() == Node::Class && !(*child)->doc().isEmpty()) {
+                    // Insert classes into the since and class maps.
+                    QString className = (*child)->name();
+                    if ((*child)->parent() &&
+                        (*child)->parent()->type() == Node::Namespace &&
+                        !(*child)->parent()->name().isEmpty())
+                        className = (*child)->parent()->name()+"::"+className;
+
+                    nsmap.value().insert(className,(*child));
+                    ncmap.value().insert(className,(*child));
+                }
+                else if ((*child)->subType() == Node::QmlClass) {
+                    // Insert QML elements into the since and element maps.
+                    QString className = (*child)->name();
+                    if ((*child)->parent() &&
+                        (*child)->parent()->type() == Node::Namespace &&
+                        !(*child)->parent()->name().isEmpty())
+                        className = (*child)->parent()->name()+"::"+className;
+
+                    nsmap.value().insert(className,(*child));
+                    nqcmap.value().insert(className,(*child));
+                }
+                else if ((*child)->type() == Node::QmlProperty) {
+                    // Insert QML properties into the since map.
+                    QString propertyName = (*child)->name();
+                    nsmap.value().insert(propertyName,(*child));
+                }
+            }
+            else {
+                // Insert external documents into the general since map.
+                QString name = (*child)->name();
+                if ((*child)->parent() &&
+                    (*child)->parent()->type() == Node::Namespace &&
+                    !(*child)->parent()->name().isEmpty())
+                    name = (*child)->parent()->name()+"::"+name;
+
+                nsmap.value().insert(name,(*child));
+            }
+
+            // Find child nodes with since commands.
+            if ((*child)->isInnerNode()) {
+                findAllSince(static_cast<InnerNode *>(*child));
+            }
+        }
+        ++child;
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index e5e9747..e66915b 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -57,6 +57,12 @@
 
 QT_BEGIN_NAMESPACE
 
+typedef QMap<QString, const Node*> NodeMap;
+typedef QMultiMap<QString, Node*> NodeMultiMap;
+typedef QMap<QString, NodeMultiMap> NewSinceMaps;
+typedef QMap<Node*, NodeMultiMap> ParentMaps;
+typedef QMap<QString, NodeMap> NewClassMaps;
+
 class ClassNode;
 class Config;
 class CodeMarker;
@@ -152,6 +158,7 @@ class Generator
 
     QString getMetadataElement(const InnerNode* inner, const QString& t);
     QStringList getMetadataElements(const InnerNode* inner, const QString& t);
+    void findAllSince(const InnerNode *node);
 
  private:
     void generateReimplementedFrom(const FunctionNode *func,
@@ -180,6 +187,11 @@ class Generator
                               const NodeList& subs,
                               CodeMarker *marker);
 
+    static QString sinceTitles[];
+    NewSinceMaps newSinceMaps;
+    NewClassMaps newClassMaps;
+    NewClassMaps newQmlClassMaps;
+
  private:
     QString amp;
     QString lt;
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 6a99a3b..4629644 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -48,6 +48,7 @@
 #include "config.h"
 #include "node.h"
 #include "tree.h"
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 52da178..655c3b4 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -66,25 +66,6 @@ bool HtmlGenerator::debugging_on = false;
 
 QString HtmlGenerator::divNavTop = "";
 
-QString HtmlGenerator::sinceTitles[] =
-    {
-        "    New Namespaces",
-        "    New Classes",
-        "    New Member Functions",
-        "    New Functions in Namespaces",
-        "    New Global Functions",
-        "    New Macros",
-        "    New Enum Types",
-        "    New Typedefs",
-        "    New Properties",
-        "    New Variables",
-        "    New QML Elements",
-        "    New QML Properties",
-        "    New QML Signals",
-        "    New QML Methods",
-        ""
-    };
-
 static bool showBrokenLinks = false;
 
 static QRegExp linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
@@ -606,14 +587,18 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             ncmap = newClassMaps.find(atom->string());
             NewClassMaps::const_iterator nqcmap;
             nqcmap = newQmlClassMaps.find(atom->string());
+
             if ((nsmap != newSinceMaps.constEnd()) && !nsmap.value().isEmpty()) {
                 QList<Section> sections;
                 QList<Section>::ConstIterator s;
+
                 for (int i=0; i<LastSinceType; ++i)
                     sections.append(Section(sinceTitle(i),QString(),QString(),QString()));
 
                 NodeMultiMap::const_iterator n = nsmap.value().constBegin();
+
                 while (n != nsmap.value().constEnd()) {
+
                     const Node* node = n.value();
                     switch (node->type()) {
                       case Node::Fake:
@@ -1346,6 +1331,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         // Generate brief text and status for modules.
         generateBrief(fake, marker);
         generateStatus(fake, marker);
+        generateSince(fake, marker);
 
         if (moduleNamespaceMap.contains(fake->name())) {
             out() << "<a name=\"" << registerRef("namespaces") << "\"></a>" << divNavTop << "\n";
@@ -1362,6 +1348,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         // Generate brief text and status for modules.
         generateBrief(fake, marker);
         generateStatus(fake, marker);
+        generateSince(fake, marker);
 
         out() << "<ul>\n";
 
@@ -1393,6 +1380,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         generateQmlInherits(qml_cn, marker);
         generateQmlInheritedBy(qml_cn, marker);
         generateQmlInstantiates(qml_cn, marker);
+        generateSince(qml_cn, marker);
 
         QString allQmlMembersLink = generateAllQmlMembersFile(qml_cn, marker);
         if (!allQmlMembersLink.isEmpty()) {
@@ -2242,9 +2230,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     for (int i=0; i<NumParagraphs; i++)         // i = 0..36
         paragraphOffset[i+1] = paragraphOffset[i] + paragraph[i].count();
 
-    int curParNr = 0;
-    int curParOffset = 0;
-
     /*
       Output the alphabet as a row of links.
      */
@@ -2262,8 +2247,12 @@ void HtmlGenerator::generateCompactList(const Node *relative,
       Output a <div> element to contain all the <dl> elements.
      */
     out() << "<div class=\"flowListDiv\">\n";
+    numTableRows = 0;
+
+    int curParNr = 0;
+    int curParOffset = 0;
 
-    for (int i=0; i<classMap.count()-1; i++) {
+    for (int i=0; i<classMap.count(); i++) {
         while ((curParNr < NumParagraphs) &&
                (curParOffset == paragraph[curParNr].count())) {
             ++curParNr;
@@ -2324,7 +2313,9 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "</dd>\n";
         curParOffset++;
     }
-    out() << "</dl>\n";
+    if (classMap.count() > 0)
+        out() << "</dl>\n";
+
     out() << "</div>\n";
 }
 
@@ -3357,70 +3348,6 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
     }
 }
 
-/*!
-  For generating the "New Classes... in 4.6" section on the
-  What's New in 4.6" page.
- */
-void HtmlGenerator::findAllSince(const InnerNode *node)
-{
-    NodeList::const_iterator child = node->childNodes().constBegin();
-    while (child != node->childNodes().constEnd()) {
-        QString sinceVersion = (*child)->since();
-        if (((*child)->access() != Node::Private) && !sinceVersion.isEmpty()) {
-            NewSinceMaps::iterator nsmap = newSinceMaps.find(sinceVersion);
-            if (nsmap == newSinceMaps.end())
-                nsmap = newSinceMaps.insert(sinceVersion,NodeMultiMap());
-            NewClassMaps::iterator ncmap = newClassMaps.find(sinceVersion);
-            if (ncmap == newClassMaps.end())
-                ncmap = newClassMaps.insert(sinceVersion,NodeMap());
-            NewClassMaps::iterator nqcmap = newQmlClassMaps.find(sinceVersion);
-            if (nqcmap == newQmlClassMaps.end())
-                nqcmap = newQmlClassMaps.insert(sinceVersion,NodeMap());
- 
-            if ((*child)->type() == Node::Function) {
-                FunctionNode *func = static_cast<FunctionNode *>(*child);
-                if ((func->status() > Node::Obsolete) &&
-                    (func->metaness() != FunctionNode::Ctor) &&
-                    (func->metaness() != FunctionNode::Dtor)) {
-                    nsmap.value().insert(func->name(),(*child));
-                }
-            }
-            else if ((*child)->url().isEmpty()) {
-                if ((*child)->type() == Node::Class && !(*child)->doc().isEmpty()) {
-                    QString className = (*child)->name();
-                    if ((*child)->parent() &&
-                        (*child)->parent()->type() == Node::Namespace &&
-                        !(*child)->parent()->name().isEmpty())
-                        className = (*child)->parent()->name()+"::"+className;
-                    nsmap.value().insert(className,(*child));
-                    ncmap.value().insert(className,(*child));
-                }
-                else if ((*child)->subType() == Node::QmlClass) {
-                    QString className = (*child)->name();
-                    if ((*child)->parent() &&
-                        (*child)->parent()->type() == Node::Namespace &&
-                        !(*child)->parent()->name().isEmpty())
-                        className = (*child)->parent()->name()+"::"+className;
-                    nsmap.value().insert(className,(*child));
-                    nqcmap.value().insert(className,(*child));
-                }
-            }
-            else {
-                QString name = (*child)->name();
-                if ((*child)->parent() &&
-                    (*child)->parent()->type() == Node::Namespace &&
-                    !(*child)->parent()->name().isEmpty())
-                    name = (*child)->parent()->name()+"::"+name;
-                nsmap.value().insert(name,(*child));
-            }
-            if ((*child)->isInnerNode()) {
-                findAllSince(static_cast<InnerNode *>(*child));
-            }
-        }
-        ++child;
-    }
-}
-
 void HtmlGenerator::findAllFunctions(const InnerNode *node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 70ec0b7..e36c562 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -56,12 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QMultiMap<QString, Node*> NodeMultiMap;
-typedef QMap<QString, NodeMultiMap> NewSinceMaps;
-typedef QMap<Node*, NodeMultiMap> ParentMaps;
-typedef QMap<QString, const Node*> NodeMap;
-typedef QMap<QString, NodeMap> NewClassMaps;
-
 class HelpProjectWriter;
 
 class HtmlGenerator : public PageGenerator
@@ -224,7 +218,6 @@ class HtmlGenerator : public PageGenerator
     void findAllFunctions(const InnerNode *node);
     void findAllLegaleseTexts(const InnerNode *node);
     void findAllNamespaces(const InnerNode *node);
-    void findAllSince(const InnerNode *node);
     static int hOffset(const Node *node);
     static bool isThreeColumnEnumValueTable(const Atom *atom);
     virtual QString getLink(const Atom *atom, 
@@ -292,10 +285,6 @@ class HtmlGenerator : public PageGenerator
     NodeMap qmlClasses;
     QMap<QString, NodeMap > funcIndex;
     QMap<Text, const Node *> legaleseTexts;
-    NewSinceMaps newSinceMaps;
-    static QString sinceTitles[];
-    NewClassMaps newClassMaps;
-    NewClassMaps newQmlClassMaps;
     static int id;
  public:
     static bool debugging_on;
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 683c210..87bbd93 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -157,6 +157,16 @@ void Node::setLink(LinkType linkType, const QString &link, const QString &desc)
 }
 
 /*!
+    Sets the information about the project and version a node was introduced
+    in. The string is simplified, removing excess whitespace before being
+    stored.
+*/
+void Node::setSince(const QString &since)
+{
+    sinc = since.simplified();
+}
+
+/*!
   Returns a string representing the access specifier.
  */
 QString Node::accessString() const
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index e1e9440..cb16bea 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -151,7 +151,7 @@ class Node
     void setDoc(const Doc& doc, bool replace = false);
     void setStatus(Status status) { sta = status; }
     void setThreadSafeness(ThreadSafeness safeness) { saf = safeness; }
-    void setSince(const QString &since) { sinc = since; }
+    void setSince(const QString &since);
     void setRelates(InnerNode* pseudoParent);
     void setModuleName(const QString &module) { mod = module; }
     void setLink(LinkType linkType, const QString &link, const QString &desc);
diff --git a/tools/qdoc3/qmlvisitor.cpp b/tools/qdoc3/qmlvisitor.cpp
index fe96f9a..98e188d 100644
--- a/tools/qdoc3/qmlvisitor.cpp
+++ b/tools/qdoc3/qmlvisitor.cpp
@@ -67,15 +67,15 @@ QmlDocVisitor::~QmlDocVisitor()
 {
 }
 
-QDeclarativeJS::AST::SourceLocation QmlDocVisitor::precedingComment(unsigned offset) const
+QDeclarativeJS::AST::SourceLocation QmlDocVisitor::precedingComment(quint32 offset) const
 {
     QDeclarativeJS::AST::SourceLocation currentLoc;
 
     foreach (const QDeclarativeJS::AST::SourceLocation &loc, engine->comments()) {
-        if (loc.begin() > lastEndOffset && loc.end() < offset)
-            currentLoc = loc;
-        else
+        if (loc.begin() >= offset)
             break;
+        else if (loc.begin() > lastEndOffset && loc.end() < offset)
+            currentLoc = loc;
     }
     if (currentLoc.isValid()) {
         QString comment = document.mid(currentLoc.offset, currentLoc.length);
@@ -195,7 +195,7 @@ bool QmlDocVisitor::visit(QDeclarativeJS::AST::UiPublicMember *member)
                     qmlPropGroup->setDefault();
                 QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlPropGroup, name, type, false);
                 qmlPropNode->setWritable(!member->isReadonlyMember);
-                applyDocumentation(member->firstSourceLocation(), qmlPropNode);
+                applyDocumentation(member->firstSourceLocation(), qmlPropGroup);
             }
         }
         break;
@@ -204,7 +204,6 @@ bool QmlDocVisitor::visit(QDeclarativeJS::AST::UiPublicMember *member)
         return false;
     }
 
-    //current->doc = precedingComment(member->firstSourceLocation().begin());
     return true;
 }
 
diff --git a/tools/qdoc3/qmlvisitor.h b/tools/qdoc3/qmlvisitor.h
index 34ed8c1..1d3a401 100644
--- a/tools/qdoc3/qmlvisitor.h
+++ b/tools/qdoc3/qmlvisitor.h
@@ -67,7 +67,7 @@ public:
     bool visit(QDeclarativeJS::AST::IdentifierPropertyName *idproperty);
 
 private:
-    QDeclarativeJS::AST::SourceLocation precedingComment(unsigned offset) const;
+    QDeclarativeJS::AST::SourceLocation precedingComment(quint32 offset) const;
     void applyDocumentation(QDeclarativeJS::AST::SourceLocation location, Node *node);
 
     QDeclarativeJS::Engine *engine;
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 4abe40c..2ae2fd6 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qml
 description             = Qml Reference Documentation
-url                     = http://qt.nokia.com/doc/4.7/
+url                     = http://qt.nokia.com/doc/4.8/
 qmlonly                 = true
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
@@ -29,9 +29,9 @@ qhp.Qml.indexTitle          = Qml Reference
 # See also extraimages.HTML
 qhp.Qml.extraFiles            = 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_ll_blank.png \
+                             images/bg_ul_blank.png \
+                             images/header_bg.png \
                              images/bg_r.png \
                              images/box_bg.png \
                              images/breadcrumb.png \
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 50a355f..aaf935a 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -10,7 +10,8 @@ defines                 = Q_QDOC \
                           Q_BYTE_ORDER \
                           QT_DEPRECATED \
                           Q_NO_USING_KEYWORD \
-                          __cplusplus
+                          __cplusplus \
+                          Q_COMPILER_INITIALIZER_LISTS
 
 versionsym              = QT_VERSION_STR
 
diff --git a/tools/qdoc3/test/qt-html-default-styles.qdocconf b/tools/qdoc3/test/qt-html-default-styles.qdocconf
index d37ef5d..0db36bc 100644
--- a/tools/qdoc3/test/qt-html-default-styles.qdocconf
+++ b/tools/qdoc3/test/qt-html-default-styles.qdocconf
@@ -8,8 +8,10 @@ HTML.stylesheets = style/offline.css
 
 HTML.scripts     =
 
-# Files not referenced in any qdoc file (last four needed by qtdemo)
-# See also qhp.Qt.extraFiles
+# Files not referenced in any qdoc file, many needed by style sheets.
+# These also need to be listed in qhp.Qt.extraFiles with the correct
+# directory prefixes.
+
 extraimages.HTML        = qt-logo.png \
                           arrow_down.png \
                           breadcrumb.png \
diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf
index 77ab3c5..03ed6fa 100644
--- a/tools/qdoc3/test/qt-html-templates-online.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf
@@ -19,7 +19,7 @@ HTML.postheader = \
     "    </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-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" \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 8a70f3b..4f0cb1f 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -55,256 +55,255 @@ qhp.Qt.extraFiles = index.html \
 
 #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 \
-
+                     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.jpg \
+                     webkit-guide/img/gal2.jpg \
+                     webkit-guide/img/gal3.jpg \
+                     webkit-guide/img/gal4.jpg \
+                     webkit-guide/img/gal5.jpg \
+                     webkit-guide/img/gal6.jpg \
+                     webkit-guide/img/gal7.jpg \
+                     webkit-guide/img/gal8.jpg \
+                     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.jpg \
+                     webkit-guide/img/land2.jpg \
+                     webkit-guide/img/land3.jpg \
+                     webkit-guide/img/land4.jpg \
+                     webkit-guide/img/land5.jpg \
+                     webkit-guide/img/land6.jpg \
+                     webkit-guide/img/land7.jpg \
+                     webkit-guide/img/land8.jpg \
+                     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-html-templates_ja_JP-online.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf
index a69d7a1..8dc17af 100644
--- a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf
@@ -24,7 +24,7 @@ HTML.postheader = \
     "    </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-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
     "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
     "        </a></li>\n" \
     "      </ul>\n" \
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf
index ed2162e..e7e8220 100644
--- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf
@@ -24,7 +24,7 @@ HTML.postheader = \
     "    </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-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
     "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
     "        </a></li>\n" \
     "      </ul>\n" \
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
index d03dfd2..fca6545 100644
--- a/tools/qdoc3/test/qt-project.qdocconf
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -5,8 +5,8 @@ include(qt-defines.qdocconf)
 
 project                 = Qt
 description             = Qt Reference Documentation
-url                     = http://qt.nokia.com/doc/4.7
-version                 = 4.7.3
+url                     = http://qt.nokia.com/doc/4.8
+version                 = 4.8.0
 
 sourceencoding          = UTF-8
 outputencoding          = UTF-8
@@ -15,14 +15,14 @@ naturallanguage         = en_US
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.473
+qhp.Qt.namespace           = com.trolltech.qt.480
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
 
-qhp.Qt.filterAttributes    = qt 4.7.3 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.7.3
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.3
+qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.8.0
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
 qhp.Qt.subprojects.classes.indexTitle = Qt's Classes