Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495		2015-12-18 08:37:31 +01:00
..
dialogs	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
effects	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
gestures	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
graphicsview	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
itemviews	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
styles	Tests: Remove empty init/cleanup slots, constructors and destructors.	2015-12-10 05:26:05 +00:00
util	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
widgets	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00