From d34282dba0ebe67c16c1ee6e25d85f019b48b615 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 15 Feb 2022 08:13:03 -0800 Subject: QFile::copy: add the underlying error messages to ours Fixes: QTBUG-100867 Pick-to: 6.3 Change-Id: Ic15405335d804bdea761fffd16d401a7c16f32f9 Reviewed-by: Oswald Buddenhagen Reviewed-by: Marc Mutz --- src/corelib/io/qfile.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/corelib/io/qfile.cpp') diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 2329613f453..4b4c624feff 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -817,7 +817,8 @@ QFile::copy(const QString &newName) totalRead += in; if (in != out.write(block, in)) { close(); - d->setError(QFile::CopyError, tr("Failure to write block")); + d->setError(QFile::CopyError, tr("Failure to write block: %1") + .arg(out.errorString())); error = true; break; } @@ -837,7 +838,8 @@ QFile::copy(const QString &newName) if (!out.rename(newName)) { error = true; close(); - d->setError(QFile::CopyError, tr("Cannot create %1 for output").arg(newName)); + d->setError(QFile::CopyError, tr("Cannot create %1 for output: %1") + .arg(newName, out.errorString())); } } #ifdef QT_NO_TEMPORARYFILE -- cgit v1.2.3