diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-24 10:52:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-24 11:55:36 +0200 |
| commit | 4399a1683a016794e22ecdd03eafca07b93af4e2 (patch) | |
| tree | d1a4da3ad9a57d60da2c7c71ae03a13701c67f16 /src/qdoc/cppcodemarker.cpp | |
| parent | d91ecc26252f42641a23e25f6a6a18495e0e7700 (diff) | |
| parent | 97075ce49ee73609330804b8bbbc12fabbb30766 (diff) | |
| download | qttools-4399a1683a016794e22ecdd03eafca07b93af4e2.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/qdoc/qmlmarkupvisitor.h
src/qdoc/qmlvisitor.h
tests/auto/qtattributionsscanner/testdata/good/expected.json
Done-With: Kai Koehne <kai.koehne@qt.io>
Change-Id: I180ee214d1e5999fc1279b092bd9214b6bf8f858
Diffstat (limited to 'src/qdoc/cppcodemarker.cpp')
0 files changed, 0 insertions, 0 deletions