diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-09-01 14:16:12 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-03 17:22:40 +0200 |
| commit | dcc57cd20db2053f6f5bcd71c4ef0f31225874b3 (patch) | |
| tree | f323732e00970229d1d597931e7f71e50d5594c2 /src/designer/src/components/formeditor/qdesigner_resource.cpp | |
| parent | 99341b1fd3948e7243fa96cb1341a7046f8d4ce7 (diff) | |
Adapt to latest changes in qtbase
Adapts to changes in:
1. QPalette / QFont regarding mask resolving.
2. QVariant::canConvert expecting now QMetaType instead of int.
Change-Id: Ief7405a1639e4b060a13ee63cfe3ad13d77e66ab
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/designer/src/components/formeditor/qdesigner_resource.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index e59d8036f..bcec066ee 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -484,7 +484,7 @@ void QDesignerResource::saveDom(DomUI *ui, QWidget *widget) const QVariant classVar = sheet->property(sheet->indexOf(QStringLiteral("objectName"))); QString classStr; - if (classVar.canConvert(QVariant::String)) + if (classVar.canConvert<QString>()) classStr = classVar.toString(); else classStr = qvariant_cast<PropertySheetStringValue>(classVar).value(); |