summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization/qjsonparser_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-03-15 19:04:30 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2019-03-15 19:04:30 +0000
commit8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (patch)
tree9f9d05bb098dc65b8a36c5db59b451573e507cb9 /src/corelib/serialization/qjsonparser_p.h
parent73a2e9c4098037aaa540b97ff097c660290622da (diff)
parent32084b073362e52df597cc388cf54f5173e20b0d (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/serialization/qjsonparser_p.h')
0 files changed, 0 insertions, 0 deletions