Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
authorAlexis Menard <alexis.menard@nokia.com>
Tue, 12 May 2009 12:11:55 +0000 (14:11 +0200)
committerAlexis Menard <alexis.menard@nokia.com>
Tue, 12 May 2009 12:11:55 +0000 (14:11 +0200)
commitf5ac9ac1387fb9aac7c74d686f0b247ac50746e1
tree8efb9b6c1029f8b9c26b96fa5389b1b0623c5163
parentcb369071fa9b15e68f91d2883ee29f12c58fc803
parentbc184432c49eb56254bc5db07c6af03718c6b0e7
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
doc/src/examples.qdoc
examples/examples.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreevent.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/kernel/qapplication.cpp
src/gui/painting/qdrawhelper.cpp