diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:47:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:47:27 +0100 |
| commit | b0fe74a5b924646568291b5ce65e7d13bccbc731 (patch) | |
| tree | 9d6eb7897f5e6634229f8d5dde775d242f67e154 /src/websockets/qwebsocketserver_p.cpp | |
| parent | 704174bcc9f445cdf9d471acfa380bec6feb3576 (diff) | |
| parent | f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ic66a4cabbe0a2af1fa59ae33026a236437434a85
Diffstat (limited to 'src/websockets/qwebsocketserver_p.cpp')
0 files changed, 0 insertions, 0 deletions