diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
| commit | 9e8daaed0466d760e047c5da58811e55e7807c0a (patch) | |
| tree | eb75deaa8be7b1bbd777416aa1995990cd0f86a1 /src/serialport/qserialportinfo_unix.cpp | |
| parent | 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 (diff) | |
| parent | 9c9255eda50af191636ff9f18df35567c307dd8c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I6a4c3e446633e6f142b87c268096b1bdc1598a62
Diffstat (limited to 'src/serialport/qserialportinfo_unix.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 3a379996..08e75c1e 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -157,7 +157,7 @@ static bool isRfcommDevice(const QString &portName) return false; bool ok; - const int portNumber = portName.mid(6).toInt(&ok); + const int portNumber = portName.midRef(6).toInt(&ok); if (!ok || (portNumber < 0) || (portNumber > 255)) return false; return true; |