Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
authorMichael Brasser <michael.brasser@nokia.com>
Mon, 31 Aug 2009 23:50:07 +0000 (09:50 +1000)
committerMichael Brasser <michael.brasser@nokia.com>
Mon, 31 Aug 2009 23:50:07 +0000 (09:50 +1000)
commit205446535fb1436765dd33121dcd15ae917a1800
tree2e80e9708d4fdfe9b80b0b4ef45432770a76059a
parentb3489278b1c54ee5c15d103d45710195083fbd2b
parent709c4df621f637bc81127e7c1a8bd59d0f2f04e4
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
13 files changed:
doc/src/index.qdoc
doc/src/modules.qdoc
src/corelib/global/qglobal.h
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/math3d/qvector3d.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/configure/configureapp.cpp
tools/linguist/lupdate/lupdate.h
tools/linguist/lupdate/main.cpp