diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:39 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:39 +0200 |
commit | 36f77170d286a85254cfa45b2f658baf555143fb (patch) | |
tree | 3a262183c29edc712597265a34be506d36bbbc91 | |
parent | 7a12af676d59a9c4fd3c711134949d8e19f48926 (diff) | |
parent | 84feab670cce8414ad54f4d19b46291c7fdb14cf (diff) | |
download | qtserialport-36f77170d286a85254cfa45b2f658baf555143fb.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I129e0d5bad77a6d1b0c69478e8c2d812dc101ed3
-rw-r--r-- | src/serialport/doc/images/blockingmaster-example.png | bin | 4656 -> 3797 bytes | |||
-rw-r--r-- | src/serialport/doc/images/blockingslave-example.png | bin | 4784 -> 3918 bytes | |||
-rw-r--r-- | src/serialport/doc/images/enumerator-example.png | bin | 18510 -> 15557 bytes | |||
-rw-r--r-- | src/serialport/doc/images/terminal-example.png | bin | 10918 -> 8548 bytes | |||
-rw-r--r-- | src/serialport/qserialport.cpp | 5 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.cpp | 11 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.h | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_freebsd.cpp | 5 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_osx.cpp | 7 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 7 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 27 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_wince.cpp | 7 | ||||
-rw-r--r-- | src/serialport/serialport.pro | 4 |
13 files changed, 39 insertions, 36 deletions
diff --git a/src/serialport/doc/images/blockingmaster-example.png b/src/serialport/doc/images/blockingmaster-example.png Binary files differindex 44aa5ec..9b5fc4a 100644 --- a/src/serialport/doc/images/blockingmaster-example.png +++ b/src/serialport/doc/images/blockingmaster-example.png diff --git a/src/serialport/doc/images/blockingslave-example.png b/src/serialport/doc/images/blockingslave-example.png Binary files differindex 44aa393..c02ae85 100644 --- a/src/serialport/doc/images/blockingslave-example.png +++ b/src/serialport/doc/images/blockingslave-example.png diff --git a/src/serialport/doc/images/enumerator-example.png b/src/serialport/doc/images/enumerator-example.png Binary files differindex c4add83..c96d990 100644 --- a/src/serialport/doc/images/enumerator-example.png +++ b/src/serialport/doc/images/enumerator-example.png diff --git a/src/serialport/doc/images/terminal-example.png b/src/serialport/doc/images/terminal-example.png Binary files differindex 28aa366..9affaae 100644 --- a/src/serialport/doc/images/terminal-example.png +++ b/src/serialport/doc/images/terminal-example.png diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 22dcfd2..3d11b31 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -961,6 +961,11 @@ bool QSerialPort::setRequestToSend(bool set) return false; } + if (d->flowControl == QSerialPort::HardwareControl) { + d->setError(QSerialPortErrorInfo(QSerialPort::UnsupportedOperationError)); + return false; + } + const bool requestToSend = isRequestToSend(); const bool retval = d->setRequestToSend(set); if (retval && (requestToSend != set)) diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 84d9f06..76c18da 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -42,6 +42,7 @@ #include "qserialportinfo.h" #include "qserialportinfo_p.h" #include "qserialport.h" +#include "qserialport_p.h" QT_BEGIN_NAMESPACE @@ -263,6 +264,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isBusy() */ +#if QT_DEPRECATED_SINCE(5, 6) /*! \fn bool QSerialPortInfo::isBusy() const @@ -271,6 +273,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) /*! @@ -287,9 +290,13 @@ bool QSerialPortInfo::hasProductIdentifier() const /*! \fn QList<qint32> QSerialPortInfo::standardBaudRates() - Returns a list of available standard baud rates supported by - the current serial port. + Returns a list of available standard baud rates supported + by the target platform. */ +QList<qint32> QSerialPortInfo::standardBaudRates() +{ + return QSerialPortPrivate::standardBaudRates(); +} /*! \fn QList<QSerialPortInfo> QSerialPortInfo::availablePorts() diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index 45dea8a..e4c9288 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -78,7 +78,9 @@ public: bool hasProductIdentifier() const; bool isNull() const; +#if QT_DEPRECATED_SINCE(5, 6) bool isBusy() const; +#endif #if QT_DEPRECATED_SINCE(5, 2) QT_DEPRECATED bool isValid() const; #endif diff --git a/src/serialport/qserialportinfo_freebsd.cpp b/src/serialport/qserialportinfo_freebsd.cpp index 49612f1..552db89 100644 --- a/src/serialport/qserialportinfo_freebsd.cpp +++ b/src/serialport/qserialportinfo_freebsd.cpp @@ -330,11 +330,6 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } -QList<qint32> QSerialPortInfo::standardBaudRates() -{ - return QSerialPortPrivate::standardBaudRates(); -} - bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); diff --git a/src/serialport/qserialportinfo_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index 5491272..ca77e5a 100644 --- a/src/serialport/qserialportinfo_osx.cpp +++ b/src/serialport/qserialportinfo_osx.cpp @@ -230,11 +230,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } -QList<qint32> QSerialPortInfo::standardBaudRates() -{ - return QSerialPortPrivate::standardBaudRates(); -} - +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -257,6 +253,7 @@ bool QSerialPortInfo::isBusy() const return true; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 0b8b517..a93ac05 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -465,11 +465,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } -QList<qint32> QSerialPortInfo::standardBaudRates() -{ - return QSerialPortPrivate::standardBaudRates(); -} - +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -492,6 +488,7 @@ bool QSerialPortInfo::isBusy() const return true; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 061207a..262ff47 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -270,16 +270,22 @@ static QString parseDeviceSerialNumber(const QString &instanceIdentifier) return instanceIdentifier.mid(firstbound + 1, lastbound - firstbound - 1); } -static QString deviceSerialNumber(const QString &instanceIdentifier, +static QString deviceSerialNumber(QString instanceIdentifier, DEVINST deviceInstanceNumber) { - QString result = parseDeviceSerialNumber(instanceIdentifier); - if (result.isEmpty()) { - const DEVINST parentNumber = parentDeviceInstanceNumber(deviceInstanceNumber); - const QString parentInstanceIdentifier = deviceInstanceIdentifier(parentNumber); - result = parseDeviceSerialNumber(parentInstanceIdentifier); + forever { + const QString result = parseDeviceSerialNumber(instanceIdentifier); + if (!result.isEmpty()) + return result; + deviceInstanceNumber = parentDeviceInstanceNumber(deviceInstanceNumber); + if (deviceInstanceNumber == 0) + break; + instanceIdentifier = deviceInstanceIdentifier(deviceInstanceNumber); + if (instanceIdentifier.isEmpty()) + break; } - return result; + + return QString(); } QList<QSerialPortInfo> QSerialPortInfo::availablePorts() @@ -351,11 +357,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } -QList<qint32> QSerialPortInfo::standardBaudRates() -{ - return QSerialPortPrivate::standardBaudRates(); -} - +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -369,6 +371,7 @@ bool QSerialPortInfo::isBusy() const } return false; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index 354de30..4abf2c2 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -126,11 +126,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } -QList<qint32> QSerialPortInfo::standardBaudRates() -{ - return QSerialPortPrivate::standardBaudRates(); -} - +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -144,6 +140,7 @@ bool QSerialPortInfo::isBusy() const } return false; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/serialport.pro b/src/serialport/serialport.pro index 92d0795..194958a 100644 --- a/src/serialport/serialport.pro +++ b/src/serialport/serialport.pro @@ -5,8 +5,8 @@ QMAKE_DOCS = $$PWD/doc/qtserialport.qdocconf config_ntddmodm: DEFINES += QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM -load(qt_module) - include($$PWD/serialport-lib.pri) +load(qt_module) + PRECOMPILED_HEADER = |