diff options
Diffstat (limited to 'src/widgets/dialogs/qfontdialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index fe8f88d64f..5dd40eaa48 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -593,6 +593,14 @@ void QFontDialogPrivate::updateStyles() cstyle.replace(QLatin1String("Oblique"), QLatin1String("Italic")); first = false; goto redo; + } else if (cstyle.contains(QLatin1String("Regular"))) { + cstyle.replace(QLatin1String("Regular"), QLatin1String("Normal")); + first = false; + goto redo; + } else if (cstyle.contains(QLatin1String("Normal"))) { + cstyle.replace(QLatin1String("Normal"), QLatin1String("Regular")); + first = false; + goto redo; } } if (!found) @@ -1006,7 +1014,6 @@ void QFontDialog::setVisible(bool visible) void QFontDialog::done(int result) { Q_D(QFontDialog); - QDialog::done(result); if (result == Accepted) { // We check if this is the same font we had before, if so we emit currentFontChanged QFont selectedFont = currentFont(); @@ -1022,6 +1029,7 @@ void QFontDialog::done(int result) d->receiverToDisconnectOnClose = nullptr; } d->memberToDisconnectOnClose.clear(); + QDialog::done(result); } bool QFontDialogPrivate::canBeNativeDialog() const |