Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>
Tue, 9 Feb 2010 15:45:29 +0000 (16:45 +0100)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>
Tue, 9 Feb 2010 15:45:29 +0000 (16:45 +0100)
commita49a2ae399643afd30dd5d2df90ecb6d6325121a
tree5ac7bbece7c7ff90f9796430e4eaaff7728dfe29
parentdadfdfaa320aa5951d8512428d59e762b0da79f3
parent392123ef5432643d1047d1e1dd71512ec39d382d
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/opengl/qgl_mac.mm
src/opengl/qgl_p.h