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

 Conflicts:
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4internalclass.cpp
	src/qml/parser/qqmljslexer.cpp
	src/qml/qml/v8/qv8engine.cpp
	src/qml/util/qqmladaptormodel_p.h
	src/quick/items/qquickanimatedsprite.cpp
	tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp

Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f

3 files changed, 10 insertions, 13 deletions

diff --git a/src/qmldebug/qqmldebugclient.cpp b/src/qmldebug/qqmldebugclient.cpp
index 7f1e8c637c..d412b7b267 100644
--- a/src/qmldebug/qqmldebugclient.cpp
+++ b/src/qmldebug/qqmldebugclient.cpp
@@ -77,7 +77,7 @@ void QQmlDebugClientPrivate::addToConnection()
     Q_Q(QQmlDebugClient);
     if (connection && !connection->addClient(name, q)) {
         qWarning() << "QQmlDebugClient: Conflicting plugin name" << name;
-        connection = 0;
+        connection = nullptr;
     }
 }
 
diff --git a/src/qmldebug/qqmldebugconnection.cpp b/src/qmldebug/qqmldebugconnection.cpp
index 73ccd7c854..67bad8d812 100644
--- a/src/qmldebug/qqmldebugconnection.cpp
+++ b/src/qmldebug/qqmldebugconnection.cpp
@@ -63,15 +63,15 @@ class QQmlDebugConnectionPrivate : public QObjectPrivate
 
 public:
     QQmlDebugConnectionPrivate();
-    QPacketProtocol *protocol;
-    QIODevice *device;
-    QLocalServer *server;
+    QPacketProtocol *protocol = nullptr;
+    QIODevice *device = nullptr;
+    QLocalServer *server = nullptr;
     QEventLoop handshakeEventLoop;
     QTimer handshakeTimer;
 
-    bool gotHello;
-    int currentDataStreamVersion;
-    int maximumDataStreamVersion;
+    bool gotHello = false;
+    int currentDataStreamVersion = QDataStream::Qt_4_7;
+    int maximumDataStreamVersion = QDataStream::Qt_DefaultCompiledVersion;
     QHash <QString, float> serverPlugins;
     QHash<QString, QQmlDebugClient *> plugins;
     QStringList removedPlugins;
@@ -81,10 +81,7 @@ public:
     void flush();
 };
 
-QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate() :
-    protocol(0), device(0), server(0), gotHello(false),
-    currentDataStreamVersion(QDataStream::Qt_4_7),
-    maximumDataStreamVersion(QDataStream::Qt_DefaultCompiledVersion)
+QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate()
 {
     handshakeTimer.setSingleShot(true);
     handshakeTimer.setInterval(3000);
@@ -303,7 +300,7 @@ void QQmlDebugConnection::close()
 
     if (d->device) {
         d->device->deleteLater();
-        d->device = 0;
+        d->device = nullptr;
     }
 }
 
diff --git a/src/qmldebug/qqmldebugconnection_p.h b/src/qmldebug/qqmldebugconnection_p.h
index be425b6cbf..ad9376886c 100644
--- a/src/qmldebug/qqmldebugconnection_p.h
+++ b/src/qmldebug/qqmldebugconnection_p.h
@@ -64,7 +64,7 @@ class QQmlDebugConnection : public QObject
     Q_DISABLE_COPY(QQmlDebugConnection)
     Q_DECLARE_PRIVATE(QQmlDebugConnection)
 public:
-    QQmlDebugConnection(QObject *parent = 0);
+    QQmlDebugConnection(QObject *parent = nullptr);
     ~QQmlDebugConnection();
 
     void connectToHost(const QString &hostName, quint16 port);