summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qresource.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-06-29 22:14:53 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-07-18 15:51:25 +0000
commitbf410ed529789f89a63af6a35bb06837b31b95a2 (patch)
tree27aaa3d4a13d556b2af9a998de3c5d5e5560913f /src/corelib/io/qresource.cpp
parentf3205a49498d3084f46bc2c2abcd085c8436553b (diff)
Convert improper uses of qt_error_string() to QSystemError::stdString()
On Windows, qt_error_string() returns the string corresponding to the Win32 API, not an errno. Replace those uses for a function that works for errno values. Change-Id: I1eba2b016de74620bfc8fffd14ccce6162bafdca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qresource.cpp')
-rw-r--r--src/corelib/io/qresource.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 32639759e4..4e7120a3b8 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -53,6 +53,7 @@
#include <qshareddata.h>
#include <qplatformdefs.h>
#include "private/qabstractfileengine_p.h"
+#include "private/qsystemerror_p.h"
#ifdef Q_OS_UNIX
# include "private/qcore_unix_p.h"
@@ -1284,7 +1285,7 @@ bool QResourceFileEngine::open(QIODevice::OpenMode flags)
return false;
d->uncompress();
if (!d->resource.isValid()) {
- d->errorString = qt_error_string(ENOENT);
+ d->errorString = QSystemError::stdString(ENOENT);
return false;
}
return true;