Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alien-squached
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>
Mon, 17 Jan 2011 15:06:10 +0000 (16:06 +0100)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>
Mon, 17 Jan 2011 15:06:10 +0000 (16:06 +0100)
commit97668bd920685d25faf82bfde2027305e67b202e
tree9e2f1efc273ffde3c80df5ddedd19d3b448208b9
parent72aa2eb43b0cf5a6eef940da05ac58f605794ffb
parent77c4df1325c4bae10c99978a325febada9fd82d0
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alien-squached

Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qwidget_mac.mm
27 files changed:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qapplication_p.h
src/gui/kernel/qcocoaapplicationdelegate_mac.mm
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoapanel_mac_p.h
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qcocoaview_mac_p.h
src/gui/kernel/qcocoawindow_mac.mm
src/gui/kernel/qcocoawindow_mac_p.h
src/gui/kernel/qcursor.h
src/gui/kernel/qcursor_mac.mm
src/gui/kernel/qdnd_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_mac.mm
src/gui/kernel/qwidget_p.h
src/gui/painting/qwindowsurface_raster.cpp
src/gui/widgets/qcocoamenu_mac.mm
src/gui/widgets/qfocusframe.cpp
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmainwindowlayout_mac.mm
tests/auto/qwidget/tst_qwidget.cpp
tests/auto/qwidget/tst_qwidget_mac_helpers.h
tests/auto/qwidget/tst_qwidget_mac_helpers.mm