Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 26 May 2011 22:37:29 +0000 (08:37 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 26 May 2011 22:37:29 +0000 (08:37 +1000)
commite4026fee42b584c59db3f9f6d5acd2b4a08324d0
tree1ffe768101ee9c361caf8fbc805e24f84a09e94f
parent0c893d56d449e49d5cc84dcb2dfc4e261f08172e
parent72c31196fdba0cd297ed42cb35959b4b305296c7
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later
  remove duplicate message
  fix "Host" header of ipv6 URLs in QNAM
  uic: Use QString::fromUtf8 for QUrl properties.
  uic: #include <QLayout> for QToolBox on non-laid-out forms.
  add test case for ipv6 url parsing
src/network/access/qhttpnetworkconnection.cpp
src/tools/uic/cpp/cppwriteincludes.cpp
src/tools/uic/cpp/cppwriteincludes.h
src/tools/uic/cpp/cppwriteinitialization.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp