Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:09:23 +0000 (23:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:09:23 +0000 (23:09 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Add QTDECLARATIVE_VERSION macro for qtdeclarative


Trivial merge