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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (87 commits)
  Fix D-Bus calls with QDBus::BlockWithGui.
  Fixes:    Add some changes for 4.6.1
  Skip tst_QSystemLock::processes
  Autotest: set these files to executable. They are CGI scripts.
  Fix an issue with HTTP headers like "private, max-age=300".
  Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation
  My changes to changes-4.6.1
  my changelog for 4.6.1
  Revert "Fixed qxmlstream autotest when using shadow builds."
  Changed log updated
  doc: Updated the descriptions of the connection types.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
  Update changelog with some of my stuff
  my 4.6.1 changelog contributions
  doc: update snippets for QtScript function expressions
  Prevent a crash when creating an inputContext from the QApplication dtor.
  QNAM HTTP Code: Cache socket state inside ensureConnection()
  tst_qhttpnetworkconnection: Test also HEAD in some tests
  tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
  QNAM HTTP Code: When starting new request, prefer connected sockets.
  ...

0 files changed, 0 insertions, 0 deletions