Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
testhelper	Add QCommandLineOption::Flags containing HiddenFromHelp and ShortOptionStyle	2016-03-23 01:08:28 +00:00
qcommandlineparser.pro	Long live QCommandLineParser!	2013-08-24 21:33:39 +02:00
tst_qcommandlineparser.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
tst_qcommandlineparser.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00