diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-24 20:37:33 +0100 |
| commit | 487844fc62bdf048224d6fc3b7eaae6347d4457b (patch) | |
| tree | 763dc03ad77fd5b43ef74e817423540caa015e4b /src/network/socket/qlocalsocket.h | |
| parent | 4ed048dded34dbe2ce2842f0d40d9f54cd7571b0 (diff) | |
| parent | 6cacd19db56b632964c3b2453bc273dac50446c9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I13c7ea6a74eb98606cf45702ae068101943bec6a
Diffstat (limited to 'src/network/socket/qlocalsocket.h')
| -rw-r--r-- | src/network/socket/qlocalsocket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 0eecab206b..da91ef0e85 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -130,7 +130,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QAbstractSocket::SocketState)) Q_PRIVATE_SLOT(d_func(), void _q_error(QAbstractSocket::SocketError)) #elif defined(Q_OS_WIN) - Q_PRIVATE_SLOT(d_func(), void _q_canWrite()) + Q_PRIVATE_SLOT(d_func(), void _q_bytesWritten(qint64)) Q_PRIVATE_SLOT(d_func(), void _q_pipeClosed()) Q_PRIVATE_SLOT(d_func(), void _q_winError(ulong, const QString &)) #else |