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

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 3 insertions, 3 deletions

diff --git a/src/network/bearer/qnetworksession_impl.cpp b/src/network/bearer/qnetworksession_impl.cpp
index 4b8631d4db..45a00b45fd 100644
--- a/src/network/bearer/qnetworksession_impl.cpp
+++ b/src/network/bearer/qnetworksession_impl.cpp
@@ -67,7 +67,7 @@ static QBearerEngineImpl *getEngineFromId(const QString &id)
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 class QNetworkSessionManagerPrivate : public QObject
@@ -75,7 +75,7 @@ class QNetworkSessionManagerPrivate : public QObject
     Q_OBJECT
 
 public:
-    QNetworkSessionManagerPrivate(QObject *parent = 0) : QObject(parent) {}
+    QNetworkSessionManagerPrivate(QObject *parent = nullptr) : QObject(parent) {}
     ~QNetworkSessionManagerPrivate() {}
 
     inline void forceSessionClose(const QNetworkConfiguration &config)
@@ -121,7 +121,7 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface()
         // Defer setting serviceConfig and activeConfig until open().
         Q_FALLTHROUGH();
     default:
-        engine = 0;
+        engine = nullptr;
     }
 
     networkConfigurationsChanged();