Liang Qi 990969655c Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: config_help.txt configure src/corelib/io/qprocess_wince.cpp src/plugins/platforms/windows/qwindowstheme.cpp src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qtimezone/BLACKLIST tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01		2016-05-12 08:33:08 +02:00
..
ipc	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
json	Unify license header usage.	2016-03-29 10:20:03 +00:00
mimetypes	Mime type browser example: Add documentation.	2016-04-19 11:34:35 +00:00
threads	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
corelib.pro	Add mime type browser example.	2016-03-24 13:03:02 +00:00