diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-03 15:50:46 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-03 17:15:54 +0000 |
| commit | 7641fe2ecda840911db5cdc2a99c45e7a1bcd313 (patch) | |
| tree | a8aa561b2955b316bdaadcc5f864433a10fd0945 /src/designer/src/components/formeditor/qdesigner_resource.cpp | |
| parent | 10b336e461364f0e6ce47e419142e6a801037111 (diff) | |
Qt Designer: Open Qt 5 forms using QDockWidget::AllDockWidgetFeatures
The enumeration value was deprecated by
qtbase/f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 and removed in Qt 6.
Ignore it as it is the default.
Task-number: QTBUG-89093
Change-Id: Ibfcaaa8a19d2f0744b4ed3373c3926e923ba9bcc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 62a01a553ad94a60162bbe1fc64745f7c6d146ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/designer/src/components/formeditor/qdesigner_resource.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/qdesigner_resource.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 970e6f352..853777d6d 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -955,6 +955,11 @@ void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &p const QString objectNameProperty = QStringLiteral("objectName"); for (DomProperty *p : properties) { QString propertyName = p->attributeName(); + if (p->kind() == DomProperty::Set && propertyName == u"features" + && o->inherits("QDockWidget") + && p->elementSet() == u"QDockWidget::AllDockWidgetFeatures") { + continue; // ### fixme Qt 7 remove this: Exclude deprecated value of Qt 5. + } if (propertyName == QLatin1String("numDigits") && o->inherits("QLCDNumber")) // Deprecated in Qt 4, removed in Qt 5. propertyName = QLatin1String("digitCount"); const int index = sheet->indexOf(propertyName); |