Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (208 commits)
  Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
  Doc: Adjusted the font sizes for the offline documentation.
  Doc: Added a missing style sheet to the qhp manifest.
  Doc: Fixed the qthelp namespace for the Qt documentation.
  Doc: including missing pages in overviews.
  Doc: Fixed typo in QCoreApplication docs
  Fixed whitespace.
  Avoid hard-coding product names in page titles.
  Doc: Unindented a code snippet.
  Doc: Fixed confusing wording of a sentence.
  Doc: Fixed a broken link.
  Doc: Updated the information about commercial editions of Qt.
  Doc: Fixed qdoc warnings about broken links.
  Doc: Added preprocessor coloring.
  Doc: Added a link from the plugin guide to the plugin deployment guide.
  Doc: Fixed the syntax of QML code snippets.
  doc: Fixed a missing * in the docs for QML_DECLARE_TYPE
  Doc: Fixed missing images in qt demo
  Doc: Fixing typo
  Doc: fixing bugs and typos based on feedback
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qdoc3/text.h b/tools/qdoc3/text.h
index e2c81ac..c88ed62 100644
--- a/tools/qdoc3/text.h
+++ b/tools/qdoc3/text.h
@@ -73,7 +73,7 @@ class Text
     QString toString() const;
     const Atom *firstAtom() const { return first; }
     const Atom *lastAtom() const { return last; }
-    Text subText(Atom::Type left, Atom::Type right, const Atom *from = 0) const;
+    Text subText(Atom::Type left, Atom::Type right, const Atom *from = 0, bool inclusive = false) const;
     void dump() const;
     void clear();