diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-02 16:06:42 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-02 16:06:42 (GMT) |
| commit | e109174cb17814d169f03be220af77e4dd5103d1 (patch) | |
| tree | c3c3660f160c8945a0366c4546d82ddb9a82ab61 | |
| parent | 871d80f4a02a645a79c87fd0b02374e950e47aa3 (diff) | |
| parent | 1eea6ca3c22a1c859d06b573570314f7bd2f2833 (diff) | |
| download | Qt-e109174cb17814d169f03be220af77e4dd5103d1.zip Qt-e109174cb17814d169f03be220af77e4dd5103d1.tar.gz Qt-e109174cb17814d169f03be220af77e4dd5103d1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
| -rw-r--r-- | doc/src/snippets/declarative/transitions-list.qml | 2 | ||||
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/declarative/transitions-list.qml b/doc/src/snippets/declarative/transitions-list.qml index 0467de2..cd413cc 100644 --- a/doc/src/snippets/declarative/transitions-list.qml +++ b/doc/src/snippets/declarative/transitions-list.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { width: 150; height: 250 diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index 44df302..e180c0a 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -2285,7 +2285,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode* inner, CodeMarker* mark /*! zzz - Generates a table of contents begining at \a node. + Generates a table of contents beginning at \a node. Currently just returns without writing anything. */ void DitaXmlGenerator::generateTableOfContents(const Node* node, |