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

[contrib/qtwebsockets.git] / src / imports / qmlwebsockets / qqmlwebsocket.h

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 205f24d..33d35e7 100644 (file)
--- 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