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/serialport/qserialportinfo.cpp | |
| parent | adccf2dcacd3fdd66e09c38302f9ce543d55f572 (diff) | |
| parent | 01e0040dce2f7edbb7856d652b34703170918733 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ibf52d73727ece041fea18c0711f018ddf9cc7960
Diffstat (limited to 'src/serialport/qserialportinfo.cpp')
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index be3eed17..3e7245e5 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() |