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

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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Suppress a warning about killing a timer that isn't active.
  ICC: Don't print warning 1259 since it's too annoying.
  Autotest: Add some comments about this obscure test.
  Add a warning about trying to release a timer ID that isn't active
  Don't need to set FD_CLOEXEC since qt_safe_* will have done that.
  Check for null-pointer to avoid a crash in textedit demo.