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

 Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9

1 files changed, 16 insertions, 32 deletions

diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 27841d9494..d2c57bcddc 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -149,26 +149,17 @@ class QPSQLDriverPrivate final : public QSqlDriverPrivate
 {
     Q_DECLARE_PUBLIC(QPSQLDriver)
 public:
-    QPSQLDriverPrivate() : QSqlDriverPrivate(),
-        connection(nullptr),
-        isUtf8(false),
-        pro(QPSQLDriver::Version6),
-        sn(nullptr),
-        pendingNotifyCheck(false),
-        hasBackslashEscape(false),
-        stmtCount(0),
-        currentStmtId(InvalidStatementId)
-    { dbmsType = QSqlDriver::PostgreSQL; }
-
-    PGconn *connection;
-    bool isUtf8;
-    QPSQLDriver::Protocol pro;
-    QSocketNotifier *sn;
+    QPSQLDriverPrivate() : QSqlDriverPrivate(QSqlDriver::PostgreSQL) {}
+
     QStringList seid;
-    mutable bool pendingNotifyCheck;
-    bool hasBackslashEscape;
-    int stmtCount;
-    StatementId currentStmtId;
+    PGconn *connection = nullptr;
+    QSocketNotifier *sn = nullptr;
+    QPSQLDriver::Protocol pro = QPSQLDriver::Version6;
+    StatementId currentStmtId = InvalidStatementId;
+    int stmtCount = 0;
+    mutable bool pendingNotifyCheck = false;
+    bool hasBackslashEscape = false;
+    bool isUtf8 = false;
 
     void appendTables(QStringList &tl, QSqlQuery &t, QChar type);
     PGresult *exec(const char *stmt);
@@ -297,25 +288,18 @@ class QPSQLResultPrivate : public QSqlResultPrivate
     Q_DECLARE_PUBLIC(QPSQLResult)
 public:
     Q_DECLARE_SQLDRIVER_PRIVATE(QPSQLDriver)
-    QPSQLResultPrivate(QPSQLResult *q, const QPSQLDriver *drv)
-      : QSqlResultPrivate(q, drv),
-        result(nullptr),
-        stmtId(InvalidStatementId),
-        currentSize(-1),
-        canFetchMoreRows(false),
-        preparedQueriesEnabled(false)
-    { }
+    using QSqlResultPrivate::QSqlResultPrivate;
 
     QString fieldSerial(int i) const override { return QLatin1Char('$') + QString::number(i + 1); }
     void deallocatePreparedStmt();
 
-    PGresult *result;
     std::queue<PGresult*> nextResultSets;
     QString preparedStmtId;
-    StatementId stmtId;
-    int currentSize;
-    bool canFetchMoreRows;
-    bool preparedQueriesEnabled;
+    PGresult *result = nullptr;
+    StatementId stmtId = InvalidStatementId;
+    int currentSize = -1;
+    bool canFetchMoreRows = false;
+    bool preparedQueriesEnabled = false;
 
     bool processResults();
 };