summaryrefslogtreecommitdiff
path: root/src/qdoc/qmlcodeparser.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-07 03:00:49 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-01-07 18:24:44 +0100
commit64e219f0880dd4927b601da52133343d9a6707af (patch)
treeac4fd15546e94ede44d38e432e394429e9530248 /src/qdoc/qmlcodeparser.cpp
parentff95498d4cac875ce7b6be62e3c5208c7d8f94d3 (diff)
parentc3f095f80f9a0e9ab8521b5ae52a9bd1495f0ee8 (diff)
downloadqttools-64e219f0880dd4927b601da52133343d9a6707af.tar.gz
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/qdoc/qmlcodeparser.cpp')
0 files changed, 0 insertions, 0 deletions