diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:40:37 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 16:40:52 +0200 |
| commit | 539d5597491893c939c7a05ff4d45261e949e9ce (patch) | |
| tree | 7c3aaeec1f082b3269f54ef2dc436ac704b3fc8f /src/websockets/qwebsocket_p.h | |
| parent | 432b75517cba65e8ab633a2fe0d53f18abd59426 (diff) | |
| parent | c2b7d3dc209fe6652571f1dcdd78fb92155e7b8b (diff) | |
| download | qtwebsockets-539d5597491893c939c7a05ff4d45261e949e9ce.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: Ie799709d6a94054ca937c70a73fd979efb9619f7
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
| -rw-r--r-- | src/websockets/qwebsocket_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 4b39dfc..e72daa5 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -61,7 +61,7 @@ #include <QtNetwork/QSslError> #include <QtNetwork/QSslSocket> #endif -#include <QtCore/QTime> +#include <QtCore/QElapsedTimer> #include <private/qobject_p.h> #include "qwebsocket.h" @@ -229,7 +229,7 @@ private: QWebSocketProtocol::CloseCode m_closeCode; QString m_closeReason; - QTime m_pingTimer; + QElapsedTimer m_pingTimer; QWebSocketDataProcessor m_dataProcessor; QWebSocketConfiguration m_configuration; |