diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:38:10 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:23:52 +0100 |
| commit | 40d3bc669e7f556ac8d6492ad324827dcf6da6c1 (patch) | |
| tree | 47d2330cf794fe5244e86350028eca9fad8c2d81 /src/serialport/qserialport.h | |
| parent | 38f43b390e5b27f6243ba781394ad2418ead6b74 (diff) | |
| parent | fbf3a8f5d50b5ae2dc90ac0af840a36530df3395 (diff) | |
| download | qtserialport-40d3bc669e7f556ac8d6492ad324827dcf6da6c1.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/serialport/qserialport.cpp
src/serialport/qserialport.h
src/serialport/qserialport_unix.cpp
src/serialport/qserialport_unix_p.h
src/serialport/qserialport_win.cpp
src/serialport/qserialport_win_p.h
src/serialport/qserialport_wince_p.h
src/serialport/qt4support/include/private/qcore_unix_p.h
Change-Id: Ifaa5ce8c1c0eb1c70246c54782719b91f3c95771
Diffstat (limited to 'src/serialport/qserialport.h')
| -rw-r--r-- | src/serialport/qserialport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index 295869d..94fe722 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -274,7 +274,7 @@ private: Q_DISABLE_COPY(QSerialPort) -#if defined (Q_OS_WIN32) || defined(Q_OS_WIN64) +#if defined (Q_OS_WIN32) Q_PRIVATE_SLOT(d_func(), bool _q_startAsyncWrite()) Q_PRIVATE_SLOT(d_func(), void _q_notified(quint32, quint32, OVERLAPPED*)) #endif |