Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 12:09:39 +0000 (22:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 12:09:39 +0000 (22:09 +1000)
commite5c522d4358bd6c9776c84c7fcfffb120d76725e
treee6bde8c1c0c571cda85f9902ffde89a66a7c0351
parent2bddf15b87a9e27bfdcbc3aec5d79da49f070c15
parent13370ead4e9184fd82c08c060dbb1ea29a51cc7c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix reversed condition introduced in 9a6cfc07e5
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once