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

 Conflicts:
	.qmake.conf
	src/gui/painting/qdrawhelper.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/widgets/styles/qstylesheetstyle.cpp

Change-Id: Ibe1cd40f46a823c9e5edbe0a3cd16be1e1686b17

2 files changed, 16 insertions, 14 deletions

diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 81b5e01d6a..cd87c3669c 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -233,19 +233,20 @@ QNetworkConfigurationManager::QNetworkConfigurationManager(QObject *parent)
     : QObject(parent)
 {
     QNetworkConfigurationManagerPrivate *priv = qNetworkConfigurationManagerPrivate();
-
-    connect(priv, SIGNAL(configurationAdded(QNetworkConfiguration)),
-            this, SIGNAL(configurationAdded(QNetworkConfiguration)));
-    connect(priv, SIGNAL(configurationRemoved(QNetworkConfiguration)),
-            this, SIGNAL(configurationRemoved(QNetworkConfiguration)));
-    connect(priv, SIGNAL(configurationChanged(QNetworkConfiguration)),
-            this, SIGNAL(configurationChanged(QNetworkConfiguration)));
-    connect(priv, SIGNAL(onlineStateChanged(bool)),
-            this, SIGNAL(onlineStateChanged(bool)));
-    connect(priv, SIGNAL(configurationUpdateComplete()),
-            this, SIGNAL(updateCompleted()));
-
-    priv->enablePolling();
+    if (priv) {
+        connect(priv, SIGNAL(configurationAdded(QNetworkConfiguration)),
+                this, SIGNAL(configurationAdded(QNetworkConfiguration)));
+        connect(priv, SIGNAL(configurationRemoved(QNetworkConfiguration)),
+                this, SIGNAL(configurationRemoved(QNetworkConfiguration)));
+        connect(priv, SIGNAL(configurationChanged(QNetworkConfiguration)),
+                this, SIGNAL(configurationChanged(QNetworkConfiguration)));
+        connect(priv, SIGNAL(onlineStateChanged(bool)),
+                this, SIGNAL(onlineStateChanged(bool)));
+        connect(priv, SIGNAL(configurationUpdateComplete()),
+                this, SIGNAL(updateCompleted()));
+
+        priv->enablePolling();
+    }
 }
 
 /*!
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 471d322998..1636bcee97 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -258,7 +258,8 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration &connectionConfig,
 
     // invalid configuration
     if (!connectionConfig.identifier().isEmpty()) {
-        const auto engines = qNetworkConfigurationManagerPrivate()->engines();
+        auto priv = qNetworkConfigurationManagerPrivate();
+        const auto engines = priv ? priv->engines() : QList<QBearerEngine *>();
         for (QBearerEngine *engine : engines) {
             if (engine->hasIdentifier(connectionConfig.identifier())) {
                 d = engine->createSessionBackend();