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

[contrib/qtwebsockets.git] / src / websockets / qwebsocketserver.h

diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h
index 4e76cd4..90e149f 100644 (file)
--- 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);