Merge commit 'qt/master' into kinetic-graphicseffect
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>
Mon, 17 Aug 2009 11:50:47 +0000 (13:50 +0200)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>
Mon, 17 Aug 2009 11:50:47 +0000 (13:50 +0200)
commit17d6f2a59fe2b170087cdf7074807c6a2dce1043
tree64af0faa3146cd516b9887c9344ebd03408bafcc
parent103334ced3b0cb6e69a1ed3075d9b81e591f37e9
parent3d50220423b96a84f1ca4c0f5ef9246345aad359
Merge commit 'qt/master' into kinetic-graphicseffect
22 files changed:
src/corelib/global/qnamespace.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.h
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
src/gui/image/qpixmapfilter.cpp
src/gui/image/qpixmapfilter_p.h
src/gui/painting/qpaintengine.h
src/opengl/gl2paintengineex/qglengineshadermanager.cpp
src/opengl/gl2paintengineex/qglengineshadermanager_p.h
src/opengl/gl2paintengineex/qglengineshadersource_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
src/opengl/opengl.pro
src/opengl/qglpixmapfilter.cpp
src/opengl/qpixmapdata_gl.cpp
src/opengl/qpixmapdata_gl_p.h
tests/auto/auto.pro
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp