diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:58:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 13:21:18 +0100 |
| commit | fb16802edcbf8feeecd6a4f760888852aafd117e (patch) | |
| tree | 910eebd355106840d6bfa24a8b73365b06272ba0 /src/qdoc/generator.cpp | |
| parent | 3c7675d9609a15bea81884560920bded736f79a6 (diff) | |
| parent | f1233878fef715c0746dcb6af7164acfb46fd418 (diff) | |
| download | qttools-5.10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
Diffstat (limited to 'src/qdoc/generator.cpp')
| -rw-r--r-- | src/qdoc/generator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index bef912013..8e6a3a73e 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -2291,6 +2291,10 @@ QString Generator::typeString(const Node *node) return "QML signal handler"; case Node::QmlMethod: return "QML method"; + case Node::Module: + return "module"; + case Node::QmlModule: + return "QML module"; default: return "documentation"; } |