diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 08:05:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 08:05:29 +0100 |
| commit | 9a70ee2389d3302f6a4262325f8a76e4d867b478 (patch) | |
| tree | 9b39f4db27d260bb32242e24630c414fcf1f582a | |
| parent | a2467f9ec2d09d6d665d169e0fb450169f921b12 (diff) | |
| parent | 03d492e49e74eefa1c83e37e833d862f4b9f1e45 (diff) | |
| download | qtserialport-9a70ee2389d3302f6a4262325f8a76e4d867b478.tar.gz | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
src/serialport/qserialportinfo_osx.cpp
src/serialport/qserialportinfo_unix.cpp
src/serialport/qserialportinfo_win.cpp
src/serialport/qserialportinfo_wince.cpp
Change-Id: I9540cf8c714a99b7ace9aeaeb003cb4a00b8303e
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo.h | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_osx.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, 0 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 47db0d8..bfa2b09 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -258,6 +258,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isBusy() */ +#if QT_DEPRECATED_SINCE(5, 6) /*! \fn bool QSerialPortInfo::isBusy() const @@ -266,6 +267,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) /*! diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index 9f0352b..fc83461 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -72,7 +72,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_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index be9897e..e2fc980 100644 --- a/src/serialport/qserialportinfo_osx.cpp +++ b/src/serialport/qserialportinfo_osx.cpp @@ -224,6 +224,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -246,6 +247,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 fe97476..475aeb4 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -459,6 +459,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -481,6 +482,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 451efef..1d55197 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -351,6 +351,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -364,6 +365,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 7c60bee..9755d74 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -120,6 +120,7 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() return serialPortInfoList; } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -133,6 +134,7 @@ bool QSerialPortInfo::isBusy() const } return false; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const |