Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Apr 2011 18:48:33 +0000 (04:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Apr 2011 18:48:33 +0000 (04:48 +1000)
commit4409d1b454f02fa1e5e07560a1db6012074172eb
tree4d4ba7b306bb2a2d8b6d143cb29e3a938ae1e39f
parent2c13a817501a7acb83cbf56d121ec572c1b4b1e9
parent7fd997903620bca50a4303776ef7aca8f0ea1f01
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fixed the declarative headers and includes within qdoc.
  Removed invalid public slots section.
  Minor feature fix led to refactoring for i18n's sake.
  Fixed string-int concatenation issue.
  Doc: Minor fix to title.
  Doc: Fixed markup.
  Doc: Added a missing command.
  Doc: Removed duplicate documentation.
  Removed some links and prettified others.
  Doc: Squashed commit of Roland Wolf's threading tutorial.