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
..
qfactoryloader	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qlibrary	Merge remote-tracking branch 'origin/5.15' into dev	2020-03-16 18:41:27 +01:00
qplugin	CMake: Fix tst_plugin	2020-02-20 15:11:01 +00:00
qpluginloader	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
quuid	Distinguish between qt_plugin and regular plugins	2019-10-28 09:20:37 +00:00
CMakeLists.txt	Convert corelib plugin tests	2019-10-21 11:17:20 +00:00
plugin.pro	Enable QPluginLoader test for static builds	2018-08-03 20:26:58 +00:00