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_wince.cpp | |
| parent | 38f43b390e5b27f6243ba781394ad2418ead6b74 (diff) | |
| parent | fbf3a8f5d50b5ae2dc90ac0af840a36530df3395 (diff) | |
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_wince.cpp')
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 9258e7e1..f8a63f24 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -340,7 +340,6 @@ bool QSerialPortPrivate::waitForReadyRead(int msec) return true; QElapsedTimer stopWatch; - stopWatch.start(); forever { @@ -369,7 +368,6 @@ bool QSerialPortPrivate::waitForBytesWritten(int msec) return false; QElapsedTimer stopWatch; - stopWatch.start(); forever { @@ -762,22 +760,6 @@ bool QSerialPortPrivate::waitForReadOrWrite(bool *selectForRead, bool *selectFor return false; } -QString QSerialPortPrivate::portNameToSystemLocation(const QString &port) -{ - QString ret = port; - if (!ret.contains(QLatin1Char(':'))) - ret.append(QLatin1Char(':')); - return ret; -} - -QString QSerialPortPrivate::portNameFromSystemLocation(const QString &location) -{ - QString ret = location; - if (ret.contains(QLatin1Char(':'))) - ret.remove(QLatin1Char(':')); - return ret; -} - static const QList<qint32> standardBaudRatePairList() { |