Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 07:55:35 +0000 (17:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 07:55:35 +0000 (17:55 +1000)
commitcede1c9626f1730ef892d95939a1761e11c3f97e
tree5b3cc5a5ebd7040554e81ce16fe14779f267099e
parent7a22950819d60545c0d6ac96b463badcf88ddbd0
parent69c4b97be2df727a3cdd3b6f70ab6e39f37d0052
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  QtUiTools: Remove Q3Support.