shiboken: Use the correct basename and extension for qdoc module files

Change-Id: I0f123c3db5b50d193b927e8003771327d50ff344
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken2/ApiExtractor/qtdocparser.cpp
index 82403a078..f53cc1ead 100644
--- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp
+++ b/sources/shiboken2/ApiExtractor/qtdocparser.cpp
@@ -63,7 +63,7 @@ void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass)
         sourceFile.setFile(sourceFileRoot + QStringLiteral(".xml"));
    if (!sourceFile.exists()) {
         qCWarning(lcShiboken).noquote().nospace()
-            << "Can't find qdoc3 file for class " << metaClass->name() << ", tried: "
+            << "Can't find qdoc file for class " << metaClass->name() << ", tried: "
             << QDir::toNativeSeparators(sourceFile.absoluteFilePath());
         return;
     }
@@ -173,9 +173,12 @@ Documentation QtDocParser::retrieveModuleDocumentation(const QString& name)
     QString sourceFile = documentationDataDirectory() + QLatin1Char('/')
                          + moduleName.toLower() + QLatin1String(".xml");
 
+    if (!QFile::exists(sourceFile))
+        sourceFile = documentationDataDirectory() + QLatin1Char('/')
+                         + moduleName.toLower() + QLatin1String("-module.webxml");
     if (!QFile::exists(sourceFile)) {
         qCWarning(lcShiboken).noquote().nospace()
-            << "Can't find qdoc3 file for module " <<  name << ", tried: "
+            << "Can't find qdoc file for module " <<  name << ", tried: "
             << QDir::toNativeSeparators(sourceFile);
         return Documentation();
     }