Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 10:36:46 +0000 (20:36 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 10:36:46 +0000 (20:36 +1000)
commit86b43e8186055ea232ae94e708d3cd381fa179df
tree8e20492c61a3925248c18e98bb229821dbf9f246
parent1a742a039802b32cfe2a92d8ef1a04c3a21a964f
parentfab911a64a72d5b7f450f3f3616e38c96d601553
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
  qmake vc(x)proj generator: support x64 Qt builds
  qmake: remove dead code from VcxprojGenerator
  qmake nmake generator: pass MAKEFLAGS to sub-make calls
qmake/generators/makefile.cpp
qmake/generators/win32/msvc_nmake.cpp
qmake/generators/win32/msvc_vcproj.cpp
qmake/generators/win32/msvc_vcproj.h