summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-03-29 09:14:55 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-03-29 14:19:12 +0000
commite49e5d87be4b30522a85037b5dd81be703882b67 (patch)
treece38c09fb999947c617f30938547eba367ee0ae8 /src/widgets/dialogs
parente65558c230bc48ae9cced1f147180f4e33517791 (diff)
QFontDialog: Fix crash when passing QFont constructed from empty string/stringlist
The standarddialogs example showed a crash when opening the font dialog due to the empty list. Amends d8602ce58b6ef268be84b9aa0166b0c3fa6a96e8. Pick-to: 6.1 Change-Id: I93191485c72712d9b2d3ea0ae104f5edb9621f0c Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index fb8a8678bf..f1c844df5e 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -812,7 +812,7 @@ void QFontDialog::changeEvent(QEvent *e)
void QFontDialog::setCurrentFont(const QFont &font)
{
Q_D(QFontDialog);
- d->family = font.families().first();
+ d->family = font.families().value(0);
d->style = QFontDatabase::styleString(font);
d->size = font.pointSize();
if (d->size == -1) {