Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	src/qdoc/htmlgenerator.cpp
	src/qtattributionsscanner/qdocgenerator.cpp

Done-With: Martin Smith <martin.smith@qt.io>
Change-Id: I56a23175579a1a699939179da2f35bbcd6c73367

1 files changed, 6 insertions, 2 deletions

diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 0cb6264dd..789e490ed 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -210,8 +210,10 @@ bool QHelpCollectionHandler::openCollectionFile()
     const FileInfoList &docList = registeredDocumentations();
     if (indexAndNamespaceFilterTablesMissing) {
         for (const QHelpCollectionHandler::FileInfo &info : docList) {
-            if (!registerIndexAndNamespaceFilterTables(info.namespaceName))
+            if (!registerIndexAndNamespaceFilterTables(info.namespaceName)) {
+                emit error(tr("Cannot register index tables in file %1.").arg(collectionFile()));
                 return false;
+            }
         }
         return true;
     }
@@ -239,8 +241,10 @@ bool QHelpCollectionHandler::openCollectionFile()
     // In this case we remove all records from tables.
     Transaction transaction(m_connectionName);
     for (const TimeStamp &timeStamp : toRemove) {
-        if (!unregisterIndexTable(timeStamp.namespaceId, timeStamp.folderId))
+        if (!unregisterIndexTable(timeStamp.namespaceId, timeStamp.folderId)) {
+            emit error(tr("Cannot unregister index tables in file %1.").arg(collectionFile()));
             return false;
+        }
     }
     transaction.commit();