Alexandru Croitor c53ee1f054 Merge remote-tracking branch 'origin/wip/cmake' into dev ... Conflicts: tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt Hopefully final merge from wip/cmake, and then all cmake changes should target dev directly. Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b		2020-02-13 23:29:51 +01:00
..
animation	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
codecs	Regenerate tests/auto/corelib/codecs	2019-11-12 17:26:41 +00:00
global	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
io	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +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/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
mimetypes	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
plugin	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
serialization	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
statemachine	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00
text	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
thread	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
time	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +01:00
tools	Merge remote-tracking branch 'origin/wip/cmake' into dev	2020-02-13 23:29:51 +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