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
..
qtconcurrentfilter	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentiteratekernel	Remove tst_qtconcurrentiteratekernel blockSize test	2017-07-29 09:35:16 +00:00
qtconcurrentmap	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01:00
qtconcurrentmedian	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentrun	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qtconcurrentthreadengine	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent.pro	QtConcurrent: Workaround GCC bug 58800 in median calculation	2013-12-03 11:45:18 +01:00