Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Thu, 24 Sep 2009 15:26:10 +0000 (17:26 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Thu, 24 Sep 2009 15:26:10 +0000 (17:26 +0200)
commit270c374c178ec5a532d37168b018cd7ebc844558
treea1f3b19daae4a40c296f127b0f8af64107c2c29a
parent4d593220a8521c75821609560a3f7e09e28988c5
parent9e4f5f2133b542cdf6f32f2fc96dccd864e68420
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
examples/webkit/formextractor/formextractor.pro
mkspecs/features/qt.prf
src/gui/painting/qpaintengineex.cpp
examples/graphicsview/elasticnodes/node.cpp
src/gui/itemviews/qstandarditemmodel.cpp
src/gui/itemviews/qstandarditemmodel_p.h
src/gui/kernel/qwidget_mac.mm
src/gui/painting/qpaintengineex.cpp
src/gui/styles/qwindowsxpstyle.cpp
src/gui/text/qfontengine_mac.mm
tests/auto/qmenu/tst_qmenu.cpp