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

Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c

3 files changed, 21 insertions, 14 deletions

diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index 59b992e803..a258d44df7 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -155,6 +155,19 @@ public:
 */
 
 /*!
+    Constructs an empty field called \a fieldName of variant type \a type.
+
+    \sa setRequiredStatus(), setLength(), setPrecision(), setDefaultValue(),
+        setGenerated(), setReadOnly()
+*/
+QSqlField::QSqlField(const QString &fieldName, QVariant::Type type)
+{
+    d = new QSqlFieldPrivate(fieldName, type, QString());
+    val = QVariant(type);
+}
+
+/*!
+    \overload
     Constructs an empty field called \a fieldName of variant type \a
     type in \a table.
 
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 30474735f4..8650ba8715 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -55,8 +55,9 @@ public:
     enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
 
     explicit QSqlField(const QString& fieldName = QString(),
-                       QVariant::Type type = QVariant::Invalid,
-                       const QString &tableName = QString());
+                       QVariant::Type type = QVariant::Invalid);
+    QSqlField(const QString &fieldName, QVariant::Type type,
+              const QString &tableName);
 
     QSqlField(const QSqlField& other);
     QSqlField& operator=(const QSqlField& other);
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();
 }
 
 /*!