Merge branch 4.6 into qt-4.7-from-4.6
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Nov 2010 16:03:35 +0000 (17:03 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Nov 2010 16:03:35 +0000 (17:03 +0100)
commit0a1a3606b6a3f466b4e48c64ad30040c729c2ca9
tree2ea385d76008fdd9ec3fa397ae877838adc1fa99
parent2c0c3a213d44ad53023a507e19d18d1e5d359aec
parente68210d2086fbdc8252298f8d7781bf84f73b6ab
Merge branch 4.6 into qt-4.7-from-4.6
src/gui/itemviews/qabstractitemview.cpp
src/gui/itemviews/qstandarditemmodel.cpp
src/network/socket/qlocalsocket_win.cpp