Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 18:55:40 +0000 (04:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 18:55:40 +0000 (04:55 +1000)
commitb6b1aebf480ef84d8b2b3a7fc338493811cc2ee0
treebfab5b23caf0293f43ccd8b7e3c8474efcab6884
parent2ed6cea09ff3761ceb662ef8aacf5edc6cd1dfc8
parent61c0b5c3923956db53408ad3513488f6f4893c2f
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Honor -nomake for examples and demos
  Update module version number to 5.0.0