diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:52:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:52:10 +0200 |
| commit | 93f56e6d682326eca71cdf14d20d4f2b9c59cffb (patch) | |
| tree | 31b8e7b5e70b7c08f55b041476e86b0e622f4c5e /src/qdoc/cppcodeparser.cpp | |
| parent | de8c576b24852764de2fe1a295b9c9def473ac80 (diff) | |
| parent | cb72077e562a5a53e52f7ac94b0c3c26320c6242 (diff) | |
| download | qttools-93f56e6d682326eca71cdf14d20d4f2b9c59cffb.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/manual/manual.pro
Change-Id: Ia39b2c337e158a0b511fc1bcbb96625e284ffa58
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
0 files changed, 0 insertions, 0 deletions