Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 28 Feb 2010 10:03:04 +0000 (11:03 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 28 Feb 2010 10:03:04 +0000 (11:03 +0100)
commit1dca379031381eb7bff91970aec8056f1b7f2efb
tree2851ca55958fd0bb0f67d3f21be207c236e88aab
parent39a2b4cb71423db004ea5e6380c9c73bb35d5a2d
parent556722030728c8ae7f091ede80fb9ceeeab5479a
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:
  Don't use SSE2 if the emmintrin.h header wasn't found.