Liang Qi 942ab49072 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/corelib/tools/tools.pri Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9		2018-02-16 08:54:58 +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.11' into dev	2018-02-16 08:54:58 +01:00
kernel	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01: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.11' into dev	2018-02-16 08:54:58 +01:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00