diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 14:50:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 14:50:05 +0100 |
| commit | 974fd5f831cf9abfbd900c49ab6c21fb04ef62da (patch) | |
| tree | 235666b5d896d5c86db5325215720425b5508ffa /src/websockets/qwebsocket_p.cpp | |
| parent | e677361e300a7747a500c3879217727a53aae245 (diff) | |
| parent | d4ac9f51f6d18a05016e3d61c06eace27501f589 (diff) | |
| download | qtwebsockets-974fd5f831cf9abfbd900c49ab6c21fb04ef62da.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0ee590f834200c488498315e66acf7cd046d43ad
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index be589db..c51ba38 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -92,7 +92,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol:: QObjectPrivate(), q_ptr(pWebSocket), m_pSocket(), - m_errorString(QWebSocket::tr("Unknown error")), + m_errorString(), m_version(version), m_resourceName(), m_requestUrl(), |