08f90adffd
Conflicts: src/corelib/serialization/qjson_p.h Change-Id: I83cea141a4de8b3998478bfded84ca9029f7a2a9 |
||
---|---|---|
.. | ||
animation | ||
codecs | ||
global | ||
io | ||
itemmodels | ||
kernel | ||
mimetypes | ||
plugin | ||
serialization | ||
statemachine | ||
text | ||
thread | ||
time | ||
tools | ||
corelib.pro |