diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-07-30 14:34:33 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-08-09 05:35:10 +0000 |
| commit | 8bbc260534a4c77e5a22a375eb6becc2fa5edf6d (patch) | |
| tree | 3ff23fc860ff00512eff014392d90f07daa3c69f /src/serialport/qserialport.h | |
| parent | 8fa108de666e815053c6e586f1efabc592ae20a5 (diff) | |
| download | qtserialport-8bbc260534a4c77e5a22a375eb6becc2fa5edf6d.tar.gz | |
Replace QSP::error signal with QSP::errorOccurred
Make the name of the signal and the name of the getter unambiguous,
which in turn allows the easy use of Qt 5-style connects.
This commit message was taken from commit qtbase/4672e31.
[ChangeLog][QtSerialPort][QSerialPort] Deprecated QSP::error()
signal in favor of new QSP::errorOccurred() one.
Change-Id: I3f04bb8b1ae686d5368d43741cd0e97748b31b8f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialport.h')
| -rw-r--r-- | src/serialport/qserialport.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index 0a7ab0f..e4a61ed 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -284,7 +284,10 @@ Q_SIGNALS: #endif void dataTerminalReadyChanged(bool set); void requestToSendChanged(bool set); +#if QT_DEPRECATED_SINCE(5, 8) void error(QSerialPort::SerialPortError serialPortError); +#endif + void errorOccurred(QSerialPort::SerialPortError error); #if QT_DEPRECATED_SINCE(5, 5) QT_DEPRECATED void settingsRestoredOnCloseChanged(bool restore); #endif |