diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-19 14:19:04 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-10 18:31:38 +0000 |
commit | 4672e319e6dd0fbaa986e056e52dbb06d78fcfa5 (patch) | |
tree | 6e259ef3944f7b611ec15c0a02c0047889f01315 /src/corelib/io/qprocess.h | |
parent | a299ae3dc4de9d62bb2b433a50a6464b7f9f2595 (diff) |
Core: Replace QProcess::error signal with QProcess::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.
[ChangeLog][QtCore] Deprecated QProcess::error() signal in favor
of new QProcess::errorOccurred() one.
Change-Id: Ic5bcf7d6878e6985f1b4fed9dbe247527d13758c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/corelib/io/qprocess.h')
-rw-r--r-- | src/corelib/io/qprocess.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 81b3ac81d0..21421e1184 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -240,7 +240,10 @@ Q_SIGNALS: void started(QPrivateSignal); void finished(int exitCode); // ### Qt 6: merge the two signals with a default value void finished(int exitCode, QProcess::ExitStatus exitStatus); - void error(QProcess::ProcessError error); +#if QT_DEPRECATED_SINCE(5,6) + QT_MOC_COMPAT void error(QProcess::ProcessError error); +#endif + void errorOccurred(QProcess::ProcessError error); void stateChanged(QProcess::ProcessState state, QPrivateSignal); void readyReadStandardOutput(QPrivateSignal); |