39a290af6c
Conflicts:
src/gui/accessible/qaccessiblecache_mac.mm
src/gui/accessible/qaccessiblecache_p.h
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/kernel/qwidget_qpa.cpp
Manually moved change in qwidget_qpa.cpp to qwidget.cpp
(
|
||
---|---|---|
.. | ||
dialogs | ||
effects | ||
graphicsview | ||
itemviews | ||
kernel | ||
styles | ||
util | ||
widgets | ||
widgets.pro |