summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-08 15:18:31 +0200
committerhjk <hjk@qt.io>2020-06-08 18:20:42 +0200
commitb12f82018df21cb8a64726297020f0fbea6d8873 (patch)
treeacbdb04d817685a14f34fccf534ea41c93ece259 /src/corelib/io
parent078c3b7d686c3dfb584f5df57b5ed5c4cb624592 (diff)
QResource: Use some qUtf16Printable() instead of toLocal8Bit().data()
Change-Id: Ia255052ea33e7d7fccb0627accd20315bbe5d393 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qresource.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 51c47d7fc6..dfaae20c34 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -814,8 +814,8 @@ void
QResource::addSearchPath(const QString &path)
{
if (!path.startsWith(QLatin1Char('/'))) {
- qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%s]",
- path.toLocal8Bit().data());
+ qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%ls]",
+ qUtf16Printable(path));
return;
}
const auto locker = qt_scoped_lock(resourceMutex());
@@ -1314,8 +1314,8 @@ QResource::registerResource(const QString &rccFilename, const QString &resourceR
{
QString r = qt_resource_fixResourceRoot(resourceRoot);
if(!r.isEmpty() && r[0] != QLatin1Char('/')) {
- qWarning("QDir::registerResource: Registering a resource [%s] must be rooted in an absolute path (start with /) [%s]",
- rccFilename.toLocal8Bit().data(), resourceRoot.toLocal8Bit().data());
+ qWarning("QDir::registerResource: Registering a resource [%ls] must be rooted in an absolute path (start with /) [%ls]",
+ qUtf16Printable(rccFilename), qUtf16Printable(resourceRoot));
return false;
}
@@ -1385,8 +1385,8 @@ QResource::registerResource(const uchar *rccData, const QString &resourceRoot)
{
QString r = qt_resource_fixResourceRoot(resourceRoot);
if(!r.isEmpty() && r[0] != QLatin1Char('/')) {
- qWarning("QDir::registerResource: Registering a resource [%p] must be rooted in an absolute path (start with /) [%s]",
- rccData, resourceRoot.toLocal8Bit().data());
+ qWarning("QDir::registerResource: Registering a resource [%p] must be rooted in an absolute path (start with /) [%ls]",
+ rccData, qUtf16Printable(resourceRoot));
return false;
}