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: (21 commits)
  Fix strict-aliasing violation warning.
  Fix warning about %x parameter type mismatch in EGL
  Fix warning about address of a function being constant.
  Fix warnings related to unused variables.
  Fix silly "will be initialised after" warning.
  Fix warning about mixing integral with non-integral type in ?:
  Fix warning about use of uninitialised variable
  Fix "value not in enum" warning with GCC 4.5.
  Fix warnings with GCC 4.5: some cases are not part of the enum
  Fix a race condition related to service acquisition.
  QNetworkReply autotest: fix possible crash
  QKqueueFileSystemWatcher: don't stop thread that isn't running
  Fix QSettings auto test to use QTRY_VERIFY
  tst_QFileSystemWatcher: Don't exit the event loop on first signal.
  QPollingFileSystemWatcherEngine: Fix double report of directory change.
  QKqueueFileSystemWatcherEngine: Use higher file descriptors.
  QKqueueFileSystemWatcherEngine: Unlock mutex between two events.
  QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
  QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
  QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
  ...

0 files changed, 0 insertions, 0 deletions