1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix some warnings

Browse Source 
Use a static logging category where possible, and check the return value
of QFile::open.

Change-Id: Ieda9f7874d1b88d9bfeb593243eb867d0c274e9f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit e0ef713a2c6a74fe574481e98f0a582819418ed0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ulf Hermann 2024-12-12 13:50:11 +01:00 committed by Qt Cherry-pick Bot
parent e076767bfd
commit 60d28c8c7c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/android/qandroidplatformiconengine.cpp
View File

@ -21,7 +21,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
Q_LOGGING_CATEGORY(lcIconEngineFontDownload, "qt.qpa.iconengine.fontdownload") Q_STATIC_LOGGING_CATEGORY(lcIconEngineFontDownload, "qt.qpa.iconengine.fontdownload")
// the primary types to work with the FontRequest API // the primary types to work with the FontRequest API
Q_DECLARE_JNI_CLASS(FontRequest, "androidx/core/provider/FontRequest") Q_DECLARE_JNI_CLASS(FontRequest, "androidx/core/provider/FontRequest")
@ -203,7 +203,13 @@ static QString fetchFont(const QString &query)
int fd = fileDescriptor.callMethod<int>("detachFd"); int fd = fileDescriptor.callMethod<int>("detachFd");
QFile file; QFile file;
file.open(fd, QFile::OpenModeFlag::ReadOnly, QFile::FileHandleFlag::AutoCloseHandle); if (!file.open(fd, QFile::OpenModeFlag::ReadOnly,
QFile::FileHandleFlag::AutoCloseHandle)) {
qCWarning(lcIconEngineFontDownload, "Font file '%ls' cannot be opened: %ls",
qUtf16Printable(fontUri.toString()),
qUtf16Printable(file.errorString()));
continue;
}
const QByteArray fontData = file.readAll(); const QByteArray fontData = file.readAll();
qCDebug(lcIconEngineFontDownload) << "Font file read:" << fontData.size() << "bytes"; qCDebug(lcIconEngineFontDownload) << "Font file read:" << fontData.size() << "bytes";
int fontId = QFontDatabase::addApplicationFontFromData(fontData); int fontId = QFontDatabase::addApplicationFontFromData(fontData);