Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7
authorOlivier Goffart <ogoffart@trolltech.com>
Wed, 31 Mar 2010 13:28:40 +0000 (15:28 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Wed, 31 Mar 2010 13:28:40 +0000 (15:28 +0200)
commit1552a6930d02bd574f5bb7c17fa5994dcb8a9e43
treed06b8fc8deb0a0739b3e4565a5a4993de897e9b4
parent85313fec454f77322deb7041726573e14f6a262a
parent93135ba7f52e0ccbbcd8bda390a69d089da62b83
Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7

Conflicts:
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicswidget.h