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: (24 commits)
  Fix accidental change in QtWebKit
  QNAM HTTP: Pipelining improvement
  fix qmake conditionals
  QtScript: Add translation context test
  Ensure we stop the name lookups in QAbstractSocket if we abort().
  Don't rely on tryStart() to do job control.
  [tst_bic] Suppress the warning about the QGraphicsProxyWidget BIC
  [tst_bic] Add two more private classes to the blacklist
  [tst_bic] Remove superfluous newline
  [tst_bic] Fix gen.sh not to generate sequential empty lines
  Fix QSslSocket::constructing autotest failure
  Improve QScript{Engine,Value}::toObject() test coverage
  [tst_bic] Add testing for Phonon too
  [tst_bic] Cache the compilation results for a faster testing
  [tst_bic] Blacklist all template expansions
  [tst_bic] Add baseline for Qt 4.6.0
  [tst_bic] Collapse multiple empty newlines.
  [tst_bic] Remove the QtNetwork classes from the QtXmlPatterns description file
  [tst_bic] Add the exception for the BIC breakage in QGraphicsProxyWidget in 4.5
  [tst_bic] Update the test to find newer versions of Qt after 4.3
  ...

0 files changed, 0 insertions, 0 deletions