AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QResource: Use some qUtf16Printable() instead of toLocal8Bit().data()

Browse Source 
Change-Id: Ia255052ea33e7d7fccb0627accd20315bbe5d393
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
hjk 2020-06-08 15:18:31 +02:00
parent 078c3b7d68
commit b12f82018d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qresource.cpp
View File

@ -814,8 +814,8 @@ void
QResource::addSearchPath(const QString &path) QResource::addSearchPath(const QString &path)
{ {
if (!path.startsWith(QLatin1Char('/'))) { if (!path.startsWith(QLatin1Char('/'))) {
qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%s]", qWarning("QResource::addResourceSearchPath: Search paths must be absolute (start with /) [%ls]",
path.toLocal8Bit().data()); qUtf16Printable(path));
return; return;
} }
const auto locker = qt_scoped_lock(resourceMutex()); 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); QString r = qt_resource_fixResourceRoot(resourceRoot);
if(!r.isEmpty() && r[0] != QLatin1Char('/')) { if(!r.isEmpty() && r[0] != QLatin1Char('/')) {
qWarning("QDir::registerResource: Registering a resource [%s] must be rooted in an absolute path (start with /) [%s]", qWarning("QDir::registerResource: Registering a resource [%ls] must be rooted in an absolute path (start with /) [%ls]",
rccFilename.toLocal8Bit().data(), resourceRoot.toLocal8Bit().data()); qUtf16Printable(rccFilename), qUtf16Printable(resourceRoot));
return false; return false;
} }
@ -1385,8 +1385,8 @@ QResource::registerResource(const uchar *rccData, const QString &resourceRoot)
{ {
QString r = qt_resource_fixResourceRoot(resourceRoot); QString r = qt_resource_fixResourceRoot(resourceRoot);
if(!r.isEmpty() && r[0] != QLatin1Char('/')) { if(!r.isEmpty() && r[0] != QLatin1Char('/')) {
qWarning("QDir::registerResource: Registering a resource [%p] must be rooted in an absolute path (start with /) [%s]", qWarning("QDir::registerResource: Registering a resource [%p] must be rooted in an absolute path (start with /) [%ls]",
rccData, resourceRoot.toLocal8Bit().data()); rccData, qUtf16Printable(resourceRoot));
return false; return false;
} }