Merge remote branch 'mainline/master' into merge_raster
authorFabien Freling <fabien.freling@nokia.com>
Wed, 23 Feb 2011 14:08:26 +0000 (15:08 +0100)
committerFabien Freling <fabien.freling@nokia.com>
Wed, 23 Feb 2011 15:28:36 +0000 (16:28 +0100)
commitcf13f99d32df6c42c5d421da41ef35e815fb46ac
tree9a86876c54ac49c7b633407c8f7a416507ffe658
parent78c5c1cae5f9e100bfb7388f68208406f0db4b42
parent0a24d2d6269d509e775f7da91c8002eddc2dcbd7
Merge remote branch 'mainline/master' into merge_raster
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qcocoawindowdelegate_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_p.h
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/painting/qwindowsurface_raster.cpp
src/gui/painting/qwindowsurface_raster_p.h
src/gui/widgets/qmainwindow.cpp