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)
commit629428a3c20b4a4ed1bde7ac748b1a84333ecc39
treee23c105051b7a84255e1a67d413ebfbd645e93be
parentf15c1fff3f4d4f2b3e0f25d986f0b190c194f9fb
parent61e6639c82f7bc10476c3890769f468a3f9ca1d6
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* '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