Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team

Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team:
  Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
  Resize event for QDesktopWidget was sent too early
  Add extra type of embedded license.
  Fix possible null pointer dereference.
  Ensure that DBus is connected before all uses.
  Fix invalid configurations being added to bearermonitor list.
  Don't delete FBO when resetting glyph cache
  Trivial: Fix coding style
  Prevent ::flush from being called on QGLWindowSurface if no painting happened.