Liang Qi 60fefff22f Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: examples/widgets/graphicsview/elasticnodes/graphwidget.cpp examples/widgets/graphicsview/elasticnodes/node.cpp examples/widgets/graphicsview/elasticnodes/node.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_drawing.mm src/widgets/kernel/qmacgesturerecognizer_p.h Change-Id: I13cf06bac75d48d779d8ee7b5c91bfc976f2a32c		2018-05-03 14:50:22 +02:00
..
dialogs	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-12 22:00:35 +02:00
effects	tests/auto/widgets/{effects,styles}: Avoid unconditional qWait()s	2018-04-25 05:47:01 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-31 01:00:13 +02:00
itemviews	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00
kernel	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-02 13:15:15 +02:00
styles	tests/auto/widgets/{effects,styles}: Avoid unconditional qWait()s	2018-04-25 05:47:01 +00:00
util	tests/auto/widgets/util: Avoid unconditional qWait()s	2018-04-13 12:32:52 +00:00
widgets	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-02 13:15:15 +02:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00