From 93f41234b519d4a423f6ddd8ae67311f75b25f9c Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sun, 2 Apr 2017 19:26:36 +0300 Subject: Move settingFromBaudRate() function into common Q_OS_UNIX guard Change-Id: Ia9b0851ea7259bc4bc1aa709992b5eb215144a77 Reviewed-by: Anton Kudryavtsev Reviewed-by: Denis Shienkov --- src/serialport/qserialport_p.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index 970b868..b0f3f0c 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -160,10 +160,6 @@ public: static QString portNameToSystemLocation(const QString &port); static QString portNameFromSystemLocation(const QString &location); -#if defined(Q_OS_UNIX) - static qint32 settingFromBaudRate(qint32 baudRate); -#endif - static QList standardBaudRates(); qint64 readBufferMaxSize; @@ -217,6 +213,8 @@ public: #elif defined(Q_OS_UNIX) + static qint32 settingFromBaudRate(qint32 baudRate); + bool initialize(QIODevice::OpenMode mode); bool setTermios(const termios *tio); bool getTermios(termios *tio); -- cgit v1.2.1