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

Conflicts:
	src/imports/qmlwebsockets/qqmlwebsocket.h

Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b

diff --cc src/imports/qmlwebsockets/qqmlwebsocket.h
index 205f24d,907506b..33d35e7
--- 1/src/imports/qmlwebsockets/qqmlwebsocket.h
--- 2/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@@ -63,8 -63,7 +63,8 @@@ class QQmlWebSocket : public QObject, p
      Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
  
  public:
-     explicit QQmlWebSocket(QObject *parent = Q_NULLPTR);
-     explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = Q_NULLPTR);
+     explicit QQmlWebSocket(QObject *parent = 0);
++    explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = 0);
      virtual ~QQmlWebSocket();
  
      enum Status

diff --cc src/websockets/qwebsocketserver.h
Simple merge