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
..
.gitignore
functions.h	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentmap.pro	Adapt to the C++ SIC introduced by P0012: noexcept overloading	2017-02-17 13:57:30 +00:00
tst_qtconcurrentmap.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01:00