Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 16:41:52 +0000 (18:41 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 16:41:52 +0000 (18:41 +0200)
commit0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87
tree7441b0f5235566477b9875d1a65cc0d7b033a6e3
parent72c0128f607d1566ede78dfbba90507086e3fe80
parentd3c1dea37f95ba2bb75a2a264e4d806c4c0c36f3
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  CSS: fixes border only affecting the first widget.
  fix closing state in QLocalSocket on Windows