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)
commitda66235392832b7b04128f62d25403ec9a7e493c
treecd35b33c99a46d241ad78d198b82a96468a448b6
parent6c6cf86e7d65f8f5154d62ad0ed67d5221269335
parent14b8b7d3de3e52a36fe7ba3569f7f5a02f5a39cc
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Add QTDECLARATIVE_VERSION macro for qtdeclarative