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_unix.cpp | |
| parent | b1005907d26a3e2f5dffaec93d656a0c1210961f (diff) | |
| parent | 40d3bc669e7f556ac8d6492ad324827dcf6da6c1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/serialport/qserialport_unix.cpp')
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 46c9d8bf..e9f69bf8 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -34,6 +34,7 @@ ****************************************************************************/ #include "qserialport_p.h" +#include "qserialportinfo_p.h" #include <errno.h> #include <sys/time.h> @@ -148,7 +149,7 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode) { Q_Q(QSerialPort); - QString lockFilePath = serialPortLockFilePath(portNameFromSystemLocation(systemLocation)); + QString lockFilePath = serialPortLockFilePath(QSerialPortInfoPrivate::portNameFromSystemLocation(systemLocation)); bool isLockFileEmpty = lockFilePath.isEmpty(); if (isLockFileEmpty) { qWarning("Failed to create a lock file for opening the device"); @@ -367,7 +368,6 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) Q_Q(QSerialPort); QElapsedTimer stopWatch; - stopWatch.start(); do { @@ -398,7 +398,6 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) return false; QElapsedTimer stopWatch; - stopWatch.start(); forever { @@ -1145,38 +1144,6 @@ qint64 QSerialPortPrivate::readPerChar(char *data, qint64 maxSize) return ret; } -#ifdef Q_OS_MAC -static const QString defaultFilePathPrefix = QStringLiteral("/dev/cu."); -static const QString unusedFilePathPrefix = QStringLiteral("/dev/tty."); -#else -static const QString defaultFilePathPrefix = QStringLiteral("/dev/"); -#endif - -QString QSerialPortPrivate::portNameToSystemLocation(const QString &port) -{ - QString ret = port; - -#ifdef Q_OS_MAC - ret.remove(unusedFilePathPrefix); -#endif - - if (!ret.contains(defaultFilePathPrefix)) - ret.prepend(defaultFilePathPrefix); - return ret; -} - -QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location) -{ - QString ret = location; - -#ifdef Q_OS_MAC - ret.remove(unusedFilePathPrefix); -#endif - - ret.remove(defaultFilePathPrefix); - return ret; -} - typedef QMap<qint32, qint32> BaudRateMap; // The OS specific defines can be found in termios.h |