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

 Conflicts:
	.qmake.conf
	src/assistant/help/qhelpcollectionhandler.cpp

Change-Id: If1408a5893bc9ade9088e01c00aab695eff131aa

1 files changed, 8 insertions, 0 deletions

diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 789e490ed..756861c1a 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -153,6 +153,9 @@ bool QHelpCollectionHandler::openCollectionFile()
         }
     }
 
+    if (m_readOnly)
+        return true;
+
     m_query->exec(QLatin1String("PRAGMA synchronous=OFF"));
     m_query->exec(QLatin1String("PRAGMA cache_size=3000"));
 
@@ -2319,4 +2322,9 @@ QStringList QHelpCollectionHandler::namespacesForFilter(const QString &filterNam
     return namespaceList;
 }
 
+void QHelpCollectionHandler::setReadOnly(bool readOnly)
+{
+    m_readOnly = readOnly;
+}
+
 QT_END_NAMESPACE