diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:41:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:51:45 +0200 |
commit | d850748283698596327653ec30decdbd6c964af8 (patch) | |
tree | 6efc71e7877294fb616f88f1f17f089d4dce1b84 /sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp | |
parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp')
-rw-r--r-- | sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp index 489d498f9..3ed278871 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp @@ -521,7 +521,13 @@ QString QtXmlToSphinx::readFromLocations(const QStringList &locations, const QSt const QString &identifier, QString *errorMessage) { QString result; - const QString resolvedPath = resolveFile(locations, path); + QString resolvedPath; + if (path.endsWith(QLatin1String(".cpp"))) { + const QString pySnippet = path.left(path.size() - 3) + QLatin1String("py"); + resolvedPath = resolveFile(locations, pySnippet); + } + if (resolvedPath.isEmpty()) + resolvedPath = resolveFile(locations, path); if (resolvedPath.isEmpty()) { QTextStream(errorMessage) << "Could not resolve \"" << path << "\" in \"" << locations.join(QLatin1String("\", \"")); |