summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2014-01-20 17:48:41 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-27 06:34:15 +0100
commit84ec01711a9869da26f04e14fda5a5fc54073e98 (patch)
tree1a023a39773477eac28c24d7b77aa173f927c32c
parent1927f5751a86988a9615d5abdf7fe4ef69d41180 (diff)
Obsolete the TxD/RxD signalsv5.2.1
They are not much of use due to the low-level OS limitations as of now, hence the obsolete proposal. It can be brought back to life at any point when we have a more clear idea what to do with this API. "faking" this signal as RealTterm probably does it, is not a nice impression for the end users. That would be more like a software "signal" (which we already have in place) rather than a real pinout hardware signal. It is interesting why Windows, Linux, etc do not provide an option for this. There must be some strong reason for it. Change-Id: Ia065e2ee9226d16e724f5e2690b25b954329d78e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
-rw-r--r--src/serialport/qserialport.cpp10
-rw-r--r--src/serialport/qserialport.h22
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,