From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Mon, 23 May 2011 12:43:48 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
X-Git-Tag: qt-v5.0.0-alpha1~2236
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=981a40aa3c4a71c486fd1a5e84af05a822bc718b;p=profile%2Fivi%2Fqtdeclarative.git

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)
---

981a40aa3c4a71c486fd1a5e84af05a822bc718b