summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2017-04-02 19:26:36 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2017-04-09 16:31:57 +0000
commit93f41234b519d4a423f6ddd8ae67311f75b25f9c (patch)
tree6075db854e9859adfbb125f7a79e3f762ee4f984
parent6e35cfa7b0b74b740ab34357c01fc030e6a0247c (diff)
downloadqtserialport-93f41234b519d4a423f6ddd8ae67311f75b25f9c.tar.gz
Move settingFromBaudRate() function into common Q_OS_UNIX guard
Change-Id: Ia9b0851ea7259bc4bc1aa709992b5eb215144a77 Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialport_p.h6
1 files 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<qint32> 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);