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
..
generate	Updated license headers	2016-01-21 18:55:18 +00:00
.gitignore
qtextscriptengine.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qtextscriptengine.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-12 08:33:08 +02:00