Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	src/plugins/platforms/ios/quiview.mm

Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf

1 files changed, 5 insertions, 12 deletions

diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index f9cc07daa1..b89d20976f 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -649,11 +649,10 @@ bool QSqlQuery::next()
 {
     if (!isSelect() || !isActive())
         return false;
-    bool b = false;
+
     switch (at()) {
     case QSql::BeforeFirstRow:
-        b = d->sqlResult->fetchFirst();
-        return b;
+        return d->sqlResult->fetchFirst();
     case QSql::AfterLastRow:
         return false;
     default:
@@ -703,13 +702,11 @@ bool QSqlQuery::previous()
         return false;
     }
 
-    bool b = false;
     switch (at()) {
     case QSql::BeforeFirstRow:
         return false;
     case QSql::AfterLastRow:
-        b = d->sqlResult->fetchLast();
-        return b;
+        return d->sqlResult->fetchLast();
     default:
         if (!d->sqlResult->fetchPrevious()) {
             d->sqlResult->setAt(QSql::BeforeFirstRow);
@@ -737,9 +734,7 @@ bool QSqlQuery::first()
         qWarning("QSqlQuery::seek: cannot seek backwards in a forward only query");
         return false;
     }
-    bool b = false;
-    b = d->sqlResult->fetchFirst();
-    return b;
+    return d->sqlResult->fetchFirst();
 }
 
 /*!
@@ -758,9 +753,7 @@ bool QSqlQuery::last()
 {
     if (!isSelect() || !isActive())
         return false;
-    bool b = false;
-    b = d->sqlResult->fetchLast();
-    return b;
+    return d->sqlResult->fetchLast();
 }
 
 /*!