Merge branch '4.5' into 4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Sat, 5 Sep 2009 01:26:46 +0000 (11:26 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Sat, 5 Sep 2009 01:30:04 +0000 (11:30 +1000)
commitb504a21a7d62b24ac5f16cb3f1a88479da1499d5
tree1b5236c294246874a2fde0157b06dfd23feb00e9
parenta522568283195cd4b851b190d249d33e25489642
parentd35fe5bb21008ab30c76ebd2fe688ea3e35c084e
Merge branch '4.5' into 4.6

Conflicts:
src/gui/itemviews/qlistview.cpp
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp