Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: (26 commits)
  QSslConfiguration documentation fix
  HTTP auto tests: do not load resources from cache that must be revalidtd
  HTTP cache backend: do not load resources that must be revalidated
  HTTP reply: do not load resources from cache that must be revalidated
  QNetworkCookie: allow spaces in unquoted values
  QNAM HTTP: Removes some comments
  QNAM HTTP: More comments
  QNAM HTTP: Implement abort() and close()
  QNAM HTTP: Comments
  QNAM: Function re-ordering
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  HTTP caching documentation: add some comments
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  QNAM: Fix initialization order warnings
  QNAM: TODO comments for Qt 5
  QNAM HTTP: Fix upload progress signal
  HTTP caching internals: fix logic for PreferNetwork and PreferCache
  HTTP Network Reply Impl: return earlier when resource loaded from cache
  HTTP Reply implementation: make cache validation method return bool
  cache: rename validateCache() to loadFromCacheIfAllowed()
  ...