Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

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:
  Autotest: no need to call exitLoop twice, from two threads.
  Fix compilation with Sun CC: __FUNCTION__ is not valid
  Fix compilation with Sun CC: const in POD parameters makes a difference
  Fix compilation on solaris-g++-x86-64: emmintrin.h is not available.
  Unbreak compilation of bootstrapped Qt tools after f3eab3d.
  QUrl: document adding of hash function
  Bump iteration count to make QMetaType::type() benchmark results more stable
  Don't lock the QMetaType custom types mutex unnecessarily
  Fix deadlock in QFSEventsFileSystemWatcherEngine.
  Improve lookup speed of QMetaType::type() for normalized types
  Add benchmarks for QMetaType type introspection functions
  Modified configure script not to override $XPLATFORM in case of CYGWIN
  Doc: summarize new QtMultimedia functionality in What's New page.
  doc:	Added \since 4.7 to several \qmlclass elements.
  check that wifi is powered on before trying to scan.