Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
authorMartin Jones <martin.jones@nokia.com>
Thu, 25 Mar 2010 22:09:36 +0000 (08:09 +1000)
committerMartin Jones <martin.jones@nokia.com>
Thu, 25 Mar 2010 22:09:36 +0000 (08:09 +1000)
commit11b9190a182c5f3c1055c100145b02a3975509ed
tree2c664ad92363204c320e23f9d1e6ca29505eaf2e
parent03686225036ebfc5cf78e3fcc66f5810a140c7d2
parent3671dbf34940e166b747b6f8f3f5758fd486073c
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
src/corelib/io/qfsfileengine_p.h
src/declarative/graphicsitems/qdeclarativeflipable.cpp
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativeitem_p.h
src/gui/graphicsview/qgraphicswidget.cpp