diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:06:32 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-01-28 10:58:22 +0100 |
| commit | 05cf5241950daeb5d6ccbf66c60faaefa09a7480 (patch) | |
| tree | 9e7b64c678e7c4bac719701e6e94955f9b092432 /src/qdoc/cppcodeparser.cpp | |
| parent | eac773c8dfd0e2166db53c88f5aa0c1e85933cac (diff) | |
| parent | f71baa5ee6603cf4e6e408306453c8278dfe0c43 (diff) | |
| download | qttools-05cf5241950daeb5d6ccbf66c60faaefa09a7480.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I30a35e0998cd2538406ae5e11e2991f855f4ecb5
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 87fade3cc..877b08279 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -456,6 +456,7 @@ void CppCodeParser::processQmlProperties(const Doc &doc, NodeList &nodes, DocLis docs.append(doc); for (const auto n : sharedNodes) scn->append(n); + scn->sort(); } } @@ -948,6 +949,8 @@ void CppCodeParser::processTopicArgs(const Doc &doc, const QString &topic, NodeL } } } + for (auto *scn : sharedCommentNodes) + scn->sort(); } } } |