Liang Qi bb0fec8057 Merge remote-tracking branch 'origin/5.10' into 5.11 ... Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d		2018-02-15 10:14:11 +01:00
..
dialogs	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
effects	Set sharedPainter correctly for QGraphicsEffect	2017-12-12 20:21:07 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.10' into 5.11	2018-02-15 10:14:11 +01:00
itemviews	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
kernel	Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11	2018-02-14 15:49:08 +00:00
styles	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
util	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-23 09:36:03 +01:00
widgets	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00