Merge branch '4.7' into qmldocs
authorDavid Boddie <david.boddie@nokia.com>
Tue, 7 Sep 2010 16:36:49 +0000 (18:36 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 7 Sep 2010 16:36:49 +0000 (18:36 +0200)
commit415ad7b69d364c41156d35b98790b02667a6671b
tree759b02134da808773a1d68eecf2eb5c0ff12167c
parent3c18c2a43260a271f8a13e89053eede15d399005
parent703d85e8991e2061062f6d7c695cdeb45d9661fd
Merge branch '4.7' into qmldocs
src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp