diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 19:41:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 19:41:34 +0200 |
| commit | 99ace34250397ae3e6ae251904b43a9da2383613 (patch) | |
| tree | 3aa6c41c1ba26dcef0556fde62f5e656c7f434fd /src/imports/qmlwebsockets/qqmlwebsocket.h | |
| parent | e5f1f3d74731416a2acc0f9272dd450f4eabccf6 (diff) | |
| parent | f35c72e71124c7077b5192944cf9b57966a258bc (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibaec93eb5919dd6cc1f34e98ad20c57b9998bc23
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocket.h')
0 files changed, 0 insertions, 0 deletions