diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-20 12:33:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-20 12:33:16 +0100 |
| commit | 5d819074af293c0855090ceb23a26fe8401a4255 (patch) | |
| tree | 7f273c7438387ff86287aa3c344fae8fed6f56c5 /src/serialport/qserialport.h | |
| parent | b1005907d26a3e2f5dffaec93d656a0c1210961f (diff) | |
| parent | 40d3bc669e7f556ac8d6492ad324827dcf6da6c1 (diff) | |
| download | qtserialport-5d819074af293c0855090ceb23a26fe8401a4255.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
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 ebd748a..45f2054 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -279,7 +279,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 |