summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2023-03-18 11:54:07 -0700
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-05-15 19:10:03 +0200
commitfb40737b0db8ab9f6f7f7ecdc17e5819545f041b (patch)
tree3f3cb41e5e6f815ca2cad773e4069f5727af2843 /src
parentba05af82d3d8b7cbc6e22f93cbf1e3d1575afefe (diff)
QProcess/Unix: improve the error message if the child modifier throws
Functionality added for 6.5, but after translatable string freeze. Change-Id: Icfe44ecf285a480fafe4fffd174d984c5349e0cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qprocess_unix.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index d16fa7498e..669c067430 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -673,8 +673,12 @@ bool QProcessPrivate::processStarted(QString *errorMessage)
}
// did we read an error message?
- if (errorMessage)
- *errorMessage = QLatin1StringView(buf.function) + ": "_L1 + qt_error_string(buf.code);
+ if (errorMessage) {
+ if (buf.code == FakeErrnoForThrow)
+ *errorMessage = QProcess::tr("childProcessModifier() function threw an exception");
+ else
+ *errorMessage = QLatin1StringView(buf.function) + ": "_L1 + qt_error_string(buf.code);
+ }
return false;
}