Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 29 Sep 2009 12:35:34 +0000 (14:35 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 29 Sep 2009 12:35:34 +0000 (14:35 +0200)
commit82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78
tree58934af99acbd49c4f9bedf66fc4a94d784048ec
parent63be458a64d6f88333cd921e587b2c651acb122f
parent640ae542541b66a5da85ce76309f9595ed2c8bf3
Merge branch '4.5' into 4.6

Conflicts:
doc/src/platform-notes.qdoc
src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp