diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:01 +0200 |
| commit | 84feab670cce8414ad54f4d19b46291c7fdb14cf (patch) | |
| tree | 329f237009d6ffd018964143db3b17d63ea823e0 /src/serialport/qserialportinfo.cpp | |
| parent | f8449352c9af0ee8055c6a85981e092e9d109b9d (diff) | |
| parent | 9a70ee2389d3302f6a4262325f8a76e4d867b478 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I1b9b5ff33064eab6e35e4fd57b72b8fbf2a5a022
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 21dedb63..76c18da2 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -264,6 +264,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isBusy() */ +#if QT_DEPRECATED_SINCE(5, 6) /*! \fn bool QSerialPortInfo::isBusy() const @@ -272,6 +273,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) /*! |