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
..
kernel	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-16 18:41:27 +01:00
models	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
CMakeLists.txt	Regenerate some of the test projects that do SUBDIRS += foo	2019-08-07 11:55:38 +00:00
sql.pro	Moved sql autotests into new directory structure	2011-09-06 09:32:15 +02:00