Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Jun 2011 06:55:52 +0000 (16:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Jun 2011 06:55:52 +0000 (16:55 +1000)
commit95b40f3f5f0c945e5052c6421861174771f29531
treec0be03e0ac0198b0aad1af3fc111e603a3d2a330
parent8f230bcca8835006507c59d4743e76bdcff62f23
parent17487a4d11146d0c501b0b13695c3d4d18aa580a
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.