diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-03 18:32:49 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-06 21:27:51 +0000 |
| commit | b84cdc8044a38c1c2e531da476951285d0dcebe8 (patch) | |
| tree | 1b8d3fc5f5fd42749c3daa6f71a13dcd8a70d758 | |
| parent | 446d2f7000d66e935d8c87595b1cf0ee37b395d1 (diff) | |
Qt Designer: Fix storing of font families
A new resolve flag for families was added in
qtbase/97f73e957756753b09a778daf2ee8f0ddb97f746.
Check it when saving fonts.
Task-number: QTBUG-46322
Fixes: QTBUG-98916
Change-Id: Ibf232330fe46a7b3b14fee88ed697540990a2fdd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 743955d89426fd42a728b086b28534e1ec701269)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/components/propertyeditor/fontpropertymanager.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/uilib/properties.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp index 4974e7975..c16816386 100644 --- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp @@ -210,7 +210,7 @@ namespace qdesigner_internal { unsigned FontPropertyManager::fontFlag(int idx) { switch (idx) { - case 0: return QFont::FamilyResolved; + case 0: return QFont::FamilyResolved | QFont::FamiliesResolved; case 1: return QFont::SizeResolved; case 2: return QFont::WeightResolved; case 3: return QFont::StyleResolved; diff --git a/src/designer/src/lib/uilib/properties.cpp b/src/designer/src/lib/uilib/properties.cpp index d7ba8cef1..a5ab40d59 100644 --- a/src/designer/src/lib/uilib/properties.cpp +++ b/src/designer/src/lib/uilib/properties.cpp @@ -448,7 +448,7 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp const uint mask = font.resolveMask(); if (mask & QFont::WeightResolved) fnt->setElementBold(font.bold()); - if (mask & QFont::FamilyResolved) + if ((mask & (QFont::FamilyResolved | QFont::FamiliesResolved)) != 0) fnt->setElementFamily(font.family()); if (mask & QFont::StyleResolved) fnt->setElementItalic(font.italic()); |