diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-27 01:00:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-27 01:00:45 +0100 |
| commit | c6fc2bc3e205e3710d1f9bdca984c3309cc2eb06 (patch) | |
| tree | 98dff745ee072895b1d3171ef439a9533689a517 /src/network/socket | |
| parent | ac7f46dd9114051756f56571b9cb3bda002314a1 (diff) | |
| parent | bc107d81004a5f3929f30088f4a58a221bea5c3b (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I14eaabe98845445a9ea5266872cc1797786cfe04
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qsocks5socketengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 3e4c35fcc5..23aec12390 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -372,7 +372,7 @@ QSocks5BindData *QSocks5BindStore::retrieve(qintptr socketDescriptor) store.erase(it); if (bindData) { if (bindData->controlSocket->thread() != QThread::currentThread()) { - qWarning("Can not access socks5 bind data from different thread"); + qWarning("Cannot access socks5 bind data from different thread"); return 0; } } else { |