diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:10:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 17:08:12 +0100 |
| commit | d9725b249de5a2a6bb45e4f4e1a1b316d91ed102 (patch) | |
| tree | 07a0282c8744242f4a5d5b493f1c0cf945306625 /src/serialport/qserialportinfo.h | |
| parent | dda7449d18cf8aaa542f869dcaea28634d21ecb0 (diff) | |
| parent | 97bbe2acd8b4c14315653a3d9dc5757d6518220e (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/serialport/qserialport.cpp
src/serialport/qserialportinfo_unix.cpp
Change-Id: I12658a9f92c91ab83f404c93a311ef947d1f2503
Diffstat (limited to 'src/serialport/qserialportinfo.h')
| -rw-r--r-- | src/serialport/qserialportinfo.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index daa255f4..8320fc5a 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -80,7 +80,9 @@ public: bool isNull() const; bool isBusy() const; - bool isValid() const; +#if QT_DEPRECATED_SINCE(5, 2) + QT_DEPRECATED bool isValid() const; +#endif static QList<qint32> standardBaudRates(); static QList<QSerialPortInfo> availablePorts(); |