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

Change-Id: Ib0252441ebf43cbd0857bae7b72a7567473105fa

2 files changed, 18 insertions, 6 deletions

diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 9884fbcc1..a7bea5494 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -294,6 +294,7 @@ bool QHelpCollectionHandler::isTimeStampCorrect(const TimeStamp &timeStamp) cons
         return false;
 
     const QString oldFileName = m_query->value(0).toString();
+    m_query->clear();
     if (oldFileName != timeStamp.fileName)
         return false;
 
@@ -316,6 +317,7 @@ bool QHelpCollectionHandler::hasTimeStampInfo(const QString &nameSpace) const
     if (!m_query->next())
         return false;
 
+    m_query->clear();
     return true;
 }
 
@@ -1016,7 +1018,10 @@ bool QHelpCollectionHandler::fileExists(const QUrl &url) const
     if (!m_query->exec() || !m_query->next())
         return false;
 
-    return m_query->value(0).toInt();
+    const int count = m_query->value(0).toInt();
+    m_query->clear();
+
+    return count;
 }
 
 static QString prepareFilterQuery(const QString &filterName)
@@ -1820,7 +1825,10 @@ QString QHelpCollectionHandler::namespaceVersion(const QString &namespaceName) c
     if (!m_query->exec() || !m_query->next())
         return QString();
 
-    return m_query->value(0).toString();
+    const QString ret = m_query->value(0).toString();
+    m_query->clear();
+
+    return ret;
 }
 
 int QHelpCollectionHandler::registerNamespace(const QString &nspace, const QString &fileName)
@@ -1844,8 +1852,10 @@ int QHelpCollectionHandler::registerNamespace(const QString &nspace, const QStri
     m_query->bindValue(0, nspace);
     m_query->bindValue(1, fi.absoluteDir().relativeFilePath(fileName));
     int namespaceId = errorValue;
-    if (m_query->exec())
+    if (m_query->exec()) {
         namespaceId = m_query->lastInsertId().toInt();
+        m_query->clear();
+    }
     if (namespaceId < 1) {
         emit error(tr("Cannot register namespace \"%1\".").arg(nspace));
         return errorValue;
@@ -1863,8 +1873,10 @@ int QHelpCollectionHandler::registerVirtualFolder(const QString &folderName, int
     m_query->bindValue(1, folderName);
 
     int virtualId = -1;
-    if (m_query->exec())
+    if (m_query->exec()) {
         virtualId = m_query->lastInsertId().toInt();
+        m_query->clear();
+    }
     if (virtualId < 1) {
         emit error(tr("Cannot register virtual folder '%1'.").arg(folderName));
         return -1;
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index d9c6f7966..ad99d95d5 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -239,9 +239,9 @@ static void printUsage()
         "    -no-sort\n"
         "           Do not sort contexts in TS files.\n"
         "    -no-recursive\n"
-        "           Do not recursively scan the following directories.\n"
+        "           Do not recursively scan directories.\n"
         "    -recursive\n"
-        "           Recursively scan the following directories (default).\n"
+        "           Recursively scan directories (default).\n"
         "    -I <includepath> or -I<includepath>\n"
         "           Additional location to look for include files.\n"
         "           May be specified multiple times.\n"