diff options
| -rw-r--r-- | src/serialport/qserialport.cpp | 10 | ||||
| -rw-r--r-- | src/serialport/qserialport.h | 22 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index b41e7a56..aa9b616b 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -291,8 +291,14 @@ int QSerialPortPrivateData::timeoutValue(int msecs, int elapsed) This enum describes the possible RS-232 pinout signals. \value NoSignal No line active - \value TransmittedDataSignal TxD (Transmitted Data). - \value ReceivedDataSignal RxD (Received Data). + \value TransmittedDataSignal TxD (Transmitted Data). This value is + obsolete. It is provided to keep old + source code working. We strongly + advise against using it in new code. + \value ReceivedDataSignal RxD (Received Data). This value is + obsolete. It is provided to keep old + source code working. We strongly + advise against using it in new code. \value DataTerminalReadySignal DTR (Data Terminal Ready). \value DataCarrierDetectSignal DCD (Data Carrier Detect). \value DataSetReadySignal DSR (Data Set Ready). diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index c07af91b..795cf33d 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -131,16 +131,6 @@ public: UnknownFlowControl = -1 }; -#if QT_DEPRECATED_SINCE(5, 2) -#if defined _MSC_VER -#pragma deprecated(UnknownBaud) -#pragma deprecated(UnknownDataBits) -#pragma deprecated(UnknownParity) -#pragma deprecated(UnknownStopBits) -#pragma deprecated(UnknownFlowControl) -#endif -#endif - enum PinoutSignal { NoSignal = 0x00, TransmittedDataSignal = 0x01, @@ -157,6 +147,18 @@ public: Q_DECLARE_FLAGS(PinoutSignals, PinoutSignal) #if QT_DEPRECATED_SINCE(5, 2) +#if defined _MSC_VER +#pragma deprecated(UnknownBaud) +#pragma deprecated(UnknownDataBits) +#pragma deprecated(UnknownParity) +#pragma deprecated(UnknownStopBits) +#pragma deprecated(UnknownFlowControl) +#pragma deprecated(TransmittedDataSignal) +#pragma deprecated(ReceivedDataSignal) +#endif +#endif + +#if QT_DEPRECATED_SINCE(5, 2) enum DataErrorPolicy { SkipPolicy, PassZeroPolicy, |