Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 31 Mar 2010 09:36:32 +0000 (11:36 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 31 Mar 2010 09:36:32 +0000 (11:36 +0200)
commit0c439d67f567ba2e7a1b9ada4e3953e5e598f168
tree00801dada770fe63e3027df58d116edccfe07cfd
parentedd41ee5488716cf8336a7d8ea0cb3d48d0e7b14
parent622a27c582f859274a5b9e40c625a6fda600b7b1
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
14 files changed:
configure
doc/src/frameworks-technologies/activeqt.qdoc
doc/src/modules.qdoc
src/gui/dialogs/qfilesystemmodel.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/text/qfontengine_win.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qsharedpointer/externaltests.cpp
tests/auto/qsharedpointer/tst_qsharedpointer.cpp