Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Jul 2011 16:05:37 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Jul 2011 16:05:37 +0000 (02:05 +1000)
commit3b7b6b5192e943f13629b1790613ee8ae263eba3
tree7f76e5d94e71cdb88c0d8368b1a28a026ce17e46
parent4f8978312a8897e27b2e548fe85f2a76402aa17a
parentc47d821917a2761fb991eea4f0cfff62ac836011
Merge branch 4.7 into qt-4.8-from-4.7
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/gui/styles/qs60style.cpp
src/network/kernel/qhostinfo.cpp