diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
| commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
| tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /sources/shiboken2/ApiExtractor/qtdocparser.cpp | |
| parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
| parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'sources/shiboken2/ApiExtractor/qtdocparser.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/qtdocparser.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken2/ApiExtractor/qtdocparser.cpp index 0ac87bd16..85c3473cd 100644 --- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken2/ApiExtractor/qtdocparser.cpp @@ -68,6 +68,17 @@ static void formatFunctionArgTypeQuery(QTextStream &str, const AbstractMetaArgum str << name; } break; + case AbstractMetaType::ContainerPattern: { // QVector<int> + str << metaType->typeEntry()->qualifiedCppName() << '<'; + const auto instantiations = metaType->instantiations(); + for (int i = 0, size = instantiations.size(); i < size; ++i) { + if (i) + str << ", "; + str << instantiations.at(i)->typeEntry()->qualifiedCppName(); + } + str << '>'; + } + break; default: // Fully qualify enums (Qt::AlignmentFlag), nested classes, etc. str << metaType->typeEntry()->qualifiedCppName(); break; @@ -218,7 +229,8 @@ Documentation QtDocParser::retrieveModuleDocumentation(const QString& name) xquery.setFocus(QUrl(sourceFile)); // Module documentation - QString query = QLatin1String("/WebXML/document/page[@name=\"") + moduleName + QLatin1String("\"]/description"); + QString query = QLatin1String("/WebXML/document/module[@name=\"") + + moduleName + QLatin1String("\"]/description"); const Documentation doc = getDocumentation(xquery, query, DocModificationList()); if (doc.isEmpty()) qCWarning(lcShiboken(), "%s", qPrintable(msgCannotFindDocumentation(sourceFile, "module", name, query))); |