Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:43:48 +0000 (22:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 12:43:48 +0000 (22:43 +1000)
commit981a40aa3c4a71c486fd1a5e84af05a822bc718b
tree91924cbd96111b6bc8df78fd6b51ffb84fa4f6a7
parent67eeff8459db037591b67e749da97b8fc0abc222
parente44827e1684dbdd958cbdfca47eecd20a0da3673
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Doc: Fixed qdoc warnings.
  Doc: Various fixes to documentation, some based on changes in master.
  Doc: Added missing project and desktop files.
  Squashed commit of changes from the 4.8-temp branch.
  Doc: Fixed incorrect inline snippet for an example .sci file.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)