Leander Beernaert 1c655fb0fc Post merge fixes ... Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>		2019-11-25 14:53:27 +00:00
..
animation	Regenerate tests/auto/corelib/animation	2019-11-12 17:25:18 +00:00
codecs	Regenerate tests/auto/corelib/codecs	2019-11-12 17:26:41 +00:00
global	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
io	Post merge fixes	2019-11-25 14:53:27 +00:00
itemmodels	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
kernel	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
mimetypes	Post merge fixes	2019-11-25 14:53:27 +00:00
plugin	Distinguish between qt_plugin and regular plugins	2019-10-28 09:20:37 +00:00
serialization	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
statemachine	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
text	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-11-19 13:53:21 +01:00
thread	Post merge fixes	2019-11-25 14:53:27 +00:00
time	Merge remote-tracking branch 'origin/dev' into wip/cmake	2019-10-14 17:46:34 +02:00
tools	Post merge fixes	2019-11-25 14:53:27 +00:00
.prev_CMakeLists.txt	Merge branch 'wip/qt6' into wip/cmake	2019-08-15 16:53:19 +02:00
CMakeLists.txt	Convert corelib plugin tests	2019-10-21 11:17:20 +00:00
corelib.pro	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00