diff options
| author | Anton Kudryavtsev <anton.kudryavtsev@corp.mail.ru> | 2020-10-30 11:16:57 +0300 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-11-02 15:22:11 +0000 |
| commit | ebfd0b14aadc8d7e1415fa6a698038dffd251cb0 (patch) | |
| tree | f2485ac422cbc49d7ff224c30d8b20e2b5a32b3b /src/gui/text | |
| parent | 4edcea762d9ce334c4c1a78234c90c118b81da87 (diff) | |
| download | qtbase-ebfd0b14aadc8d7e1415fa6a698038dffd251cb0.tar.gz | |
macOS + FreeType: fix crash with non printable unicode
Task-number: QTBUG-84096
Pick-to: 5.15
Pick-to: 5.12
Change-Id: Ia60b7094ef9e82cf24f5a8b7995000ae65bb379a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/coretext/qcoretextfontdatabase.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/text/coretext/qcoretextfontdatabase.mm b/src/gui/text/coretext/qcoretextfontdatabase.mm index ba3c2424d0..ee145a03d5 100644 --- a/src/gui/text/coretext/qcoretextfontdatabase.mm +++ b/src/gui/text/coretext/qcoretextfontdatabase.mm @@ -406,7 +406,10 @@ QFontEngine *QCoreTextFontDatabaseEngineFactory<QFontEngineFT>::fontEngine(const faceId.filename = QString::fromNSString(url.path).toUtf8(); return QFontEngineFT::create(fontDef, faceId); } - Q_UNREACHABLE(); + // We end up here with a descriptor does not contain Qt font data or kCTFontURLAttribute. + // Since the FT engine can't deal with a descriptor with just a NSFontNameAttribute, + // we should return nullptr. + return nullptr; } #endif |