Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Nov 2010 20:30:15 +0000 (21:30 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Nov 2010 20:30:15 +0000 (21:30 +0100)
commitb1c412cefa51f0eea79dbf279f2a23414ccecc3d
treebc230caaebfaac6b28424a80f18edb17c69f2f62
parente158714ea545bd74600f121ab726cf2cf848f3b9
parent1d11e612c2970af69061806b40b0d632a87a8309
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Doc: Documented that border width does not affect rectangle geometry.
  Doc: Minor fixes to style.
  Doc: Updated the DirectFB documentation to reflect version changes.
  Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick
  Doc: Correcting references to Qt Declarative module.
  doc: Stated that the destructor does not call close().
doc/src/declarative/qtbinding.qdoc