Simon Hausmann ff922e7b87 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a		2020-03-16 18:41:27 +01:00
..
CMakeLists.txt	Regenerate tests/auto/corelib/kernel	2019-11-12 17:25:04 +00:00
qelapsedtimer.pro	Move QElapsedTimer to src/corelib/kernel	2016-07-02 07:51:45 +00:00
tst_qelapsedtimer.cpp	Fix flaky QElapsedTimer::elapsed test case	2020-02-27 10:36:57 +01:00