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:
  tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttp
  Revert "Fix QNetworkReply autotest cases for QT-3494"
  Revert "QNAM HTTP: Fix missing error() signal"
  licensing: exclude generated cookie jar table from license check
  fix include path
  fix build with namespaces in new cookie jar table
  cookie jar code: enhance security by keeping track of effective TLDs
  Add support for QMetaType::QVariant in ActiveQt
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

0 files changed, 0 insertions, 0 deletions