Leander Beernaert 48c82e90af Post Merge Fixes ... Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>		2020-01-24 12:29:18 +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 merge-dev	2020-01-24 13:17:33 +01:00
io	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
itemmodels	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
kernel	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
mimetypes	Post Merge Fixes	2020-01-24 12:29:18 +00:00
plugin	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
serialization	Post Merge Fixes	2020-01-24 12:29:18 +00: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 merge-dev	2020-01-24 13:17:33 +01:00
thread	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
time	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
tools	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01: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