Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 15:53:05 +0000 (01:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 15:53:05 +0000 (01:53 +1000)
commitb5155fbb3a43e056c5267148dbf27f09d67be854
tree2f7c8a2b7d940c6d73f67904f0bfa8f75df40d96
parentc0b9ed2e09ea79b3fb0685358cfd41246622d052
parent73e1f35fa39d64aa5f048df44382bd193f1aad44
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Removed duplicate setting of QT dependencies