Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 08:17:06 +0000 (18:17 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 08:17:06 +0000 (18:17 +1000)
commitd0343621a3301cb7a738bba84854d512737d1cfd
treeafef0eee50fe920bcb5c10f6d41af6ef96d72c4f
parent94021247c1ff8c4a4aa981a360b552e0e618e664
parentedd56d531bedd83dc4decee5720bd75fffc0b44c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove const from QPlatformClipboard::mimeData().