Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 17:47:05 +0000 (03:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Aug 2011 17:47:05 +0000 (03:47 +1000)
commit84408e18ac5a5ccc69cf34832f31ef63b3ff9f11
tree16a5eb509930c5696e01b62c4f71146fd262296a
parent5d5cfa71fbb7ed7b4e7f43f015acbeb7b8b00807
parent89c6b83ee22ceb009c26c826cc4158d179312434
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:
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  qdoc: Fixed QTBUG-19338
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp