diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:29:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:29:07 +0200 |
| commit | 3b1da8a7754b37d5767aeb55a7ca46e4180a6109 (patch) | |
| tree | 6748bf907f7751375379318bab45cf1fb8deb107 /src/qdoc/cppcodeparser.cpp | |
| parent | 2b062a567c5ab282ce663ac5edf03b2cb56265ce (diff) | |
| parent | 0731b64ee6d3439e6ddfa3ee58a7e909b170ebb0 (diff) | |
| download | qttools-3b1da8a7754b37d5767aeb55a7ca46e4180a6109.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/assistant/assistant/doc/src/assistant-manual.qdoc
Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d
Diffstat (limited to 'src/qdoc/cppcodeparser.cpp')
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index c42f1fb31..5b7792d32 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -1034,8 +1034,9 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, */ void CppCodeParser::processOtherMetaCommands(const Doc& doc, Node *node) { - const QSet<QString> metaCommands = doc.metaCommandsUsed(); - QSet<QString>::ConstIterator cmd = metaCommands.constBegin(); + QStringList metaCommands = doc.metaCommandsUsed().toList(); + metaCommands.sort(); + QStringList::ConstIterator cmd = metaCommands.constBegin(); while (cmd != metaCommands.constEnd()) { ArgList args = doc.metaCommandArgs(*cmd); ArgList::ConstIterator arg = args.constBegin(); |