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 09:53:21 +0000 (19:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 6 May 2011 09:53:21 +0000 (19:53 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  qmake vc(x)proj generator: support x64 Qt builds
  qmake: remove dead code from VcxprojGenerator


Trivial merge