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 06:47:34 +0100
commitc3f095f80f9a0e9ab8521b5ae52a9bd1495f0ee8 (patch)
tree66d5aa1388352c5fe68ee284a12a1b25b68c2341 /src/qdoc/qmlcodeparser.cpp
parent5997f581bc401f531b96fab5e69696a418ce5669 (diff)
parent3a9b6fc440b6c1ca290ac1140d3f726cf6b11765 (diff)
downloadqttools-c3f095f80f9a0e9ab8521b5ae52a9bd1495f0ee8.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iedc2f057fbc2c78a0ed11661dbe9141a542f0de1
Diffstat (limited to 'src/qdoc/qmlcodeparser.cpp')
0 files changed, 0 insertions, 0 deletions