diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:11:21 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:12:16 +0200 |
commit | 10a37e9f7fed2c80aac09ac1c662f6a0b3de37f7 (patch) | |
tree | 74fa9bafa05da9d3da47e66b5a4780cb5535ae0c /src | |
parent | adccf2dcacd3fdd66e09c38302f9ce543d55f572 (diff) | |
parent | 01e0040dce2f7edbb7856d652b34703170918733 (diff) | |
download | qtserialport-10a37e9f7fed2c80aac09ac1c662f6a0b3de37f7.tar.gz |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ibf52d73727ece041fea18c0711f018ddf9cc7960
Diffstat (limited to 'src')
-rw-r--r-- | src/serialport/qserialport.cpp | 4 | ||||
-rw-r--r-- | src/serialport/qserialportinfo.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_mac.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 2 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_wince.cpp | 2 |
6 files changed, 12 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index e7874f0..9ed1c5f 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -570,6 +570,7 @@ void QSerialPort::close() QIODevice::close(); } +#if QT_DEPRECATED_SINCE(5, 3) /*! \property QSerialPort::settingsRestoredOnClose \brief the flag which specifies to restore the previous settings when closing @@ -580,7 +581,6 @@ void QSerialPort::close() The default state of the QSerialPort class is to restore the settings. */ -#if QT_DEPRECATED_SINCE(5,3) void QSerialPort::setSettingsRestoredOnClose(bool restore) { Q_D(QSerialPort); @@ -1063,6 +1063,7 @@ bool QSerialPort::atEnd() const return QIODevice::atEnd() && (!isOpen() || (d->buffer.size() == 0)); } +#if QT_DEPRECATED_SINCE(5, 2) /*! \property QSerialPort::dataErrorPolicy \brief the error policy for how the process receives characters in the case where @@ -1079,7 +1080,6 @@ bool QSerialPort::atEnd() const with the kernel and hardware. Hence, the two scenarios cannot be completely compared to each other. */ -#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPort::setDataErrorPolicy(DataErrorPolicy policy) { Q_D(QSerialPort); diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index be3eed1..3e7245e 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -266,6 +266,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#if QT_DEPRECATED_SINCE(5, 2) /*! \fn bool QSerialPortInfo::isValid() const \obsolete @@ -275,6 +276,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull(), isBusy() */ +#endif // QT_DEPRECATED_SINCE(5, 2) /*! \fn QList<qint32> QSerialPortInfo::standardBaudRates() diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index e917545..4e73025 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -236,11 +236,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 0add5b6..b17ec34 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -463,11 +463,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index b3333fa..38190b7 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -364,6 +364,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -377,6 +378,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index aa590ba..3688bc3 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -139,6 +139,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -152,6 +153,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { |