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
..
ipc	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
mimetypes	Regenerate examples	2020-02-04 18:50:39 +00:00
serialization	Regenerate examples	2020-02-04 18:50:39 +00:00
threads	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-16 18:41:27 +01:00
tools	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-03 14:13:02 +01:00
CMakeLists.txt	Allow to build examples as standalone project	2019-06-05 12:53:28 +00:00
corelib.pro	threads: disable threads examples for nothread builds	2018-12-10 05:36:08 +00:00