diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
| commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
| tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/corelib/io/qprocess.cpp | |
| parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
| parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 642393955b7..0b964e6a21c 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -999,7 +999,12 @@ void QProcessPrivate::setErrorAndEmit(QProcess::ProcessError error, const QStrin Q_ASSERT(error != QProcess::UnknownError); setError(error, description); emit q->errorOccurred(processError); +#if QT_DEPRECATED_SINCE(5, 6) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->error(processError); +QT_WARNING_POP +#endif } /*! |