Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Mon, 31 Oct 2011 14:03:00 +0000 (15:03 +0100)
committerLiang Qi <liang.qi@nokia.com>
Mon, 31 Oct 2011 14:03:00 +0000 (15:03 +0100)
commit8da9881989ca55f7d5e9e74c91e3abc98ce8a1b5
treef8ea3bac554266d7f74cf5495dc2de4c6a524c58
parentcf5695691682957b68b67fd951addf4a52bfba84
parentda8a056dbb0e4b0a65d94857cdd65ddcb8633341
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp
doc/src/qt-webpages.qdoc
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/network/access/qnetworkdiskcache.cpp