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

Conflicts:
	src/imports/qmlwebsockets/qqmlwebsocket.h

Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b

4 files changed, 5 insertions, 5 deletions

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 205f24d..33d35e7 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -63,8 +63,8 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus
     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 --git a/src/websockets/qmaskgenerator.h b/src/websockets/qmaskgenerator.h
index 6714930..a93ed01 100644
--- a/src/websockets/qmaskgenerator.h
+++ b/src/websockets/qmaskgenerator.h
@@ -52,7 +52,7 @@ class Q_WEBSOCKETS_EXPORT QMaskGenerator : public QObject
     Q_DISABLE_COPY(QMaskGenerator)
 
 public:
-    explicit QMaskGenerator(QObject *parent = Q_NULLPTR);
+    explicit QMaskGenerator(QObject *parent = 0);
     virtual ~QMaskGenerator();
 
     virtual bool seed() = 0;
diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index bf85cc0..77d3973 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -69,7 +69,7 @@ class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject
 public:
     explicit QWebSocket(const QString &origin = QString(),
                         QWebSocketProtocol::Version version = QWebSocketProtocol::VersionLatest,
-                        QObject *parent = Q_NULLPTR);
+                        QObject *parent = 0);
     virtual ~QWebSocket();
 
     void abort();
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 4e76cd4..90e149f 100644
--- a/src/websockets/qwebsocketserver.h
+++ b/src/websockets/qwebsocketserver.h
@@ -77,7 +77,7 @@ public:
     };
 
     explicit QWebSocketServer(const QString &serverName, SslMode secureMode,
-                              QObject *parent = Q_NULLPTR);
+                              QObject *parent = 0);
     virtual ~QWebSocketServer();
 
     bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 0);