diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-11-24 09:35:39 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-24 21:49:54 +0100 |
| commit | 8302ca22f42f984a16187fae209bdc1d79bc18da (patch) | |
| tree | c30adc4bad47abcb44a78e35e85948b43e03fe03 /src/gui | |
| parent | 116c2115f84ec2f5f12b5d7680cd83ceeef72a6e (diff) | |
Return a QString() if the families list is empty
Fixes: QTBUG-88781
Change-Id: Iafed2be29e2e0c3029e832986ba58d19446214eb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfont.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 2021363da5..43dccb1ded 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -825,7 +825,7 @@ QFont &QFont::operator=(const QFont &font) */ QString QFont::family() const { - return d->request.families.first(); + return d->request.families.isEmpty() ? QString() : d->request.families.first(); } /*! @@ -2602,7 +2602,7 @@ QString QFontInfo::family() const { QFontEngine *engine = d->engineForScript(QChar::Script_Common); Q_ASSERT(engine != nullptr); - return engine->fontDef.families.first(); + return engine->fontDef.families.isEmpty() ? QString() : engine->fontDef.families.first(); } /*! |