Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 23:39:30 +0000 (09:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 23:39:30 +0000 (09:39 +1000)
commit65f138ac6b8472ace226e769062f6aa92ebf9480
treecc40f68dc47fb9f819ffac2eba26da5ae75bcfb1
parent9ab069286660101e2a2a6b49587bc21a69339e77
parent03bb8fb0af66a24c2b532d2fe6febb426c64f684
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Update QTextOdfWriter test case to match actual (correct) output
tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp