From a5e2f2ddad0cc6b6a06f51e0dce6acf0fecf9de6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 3 Dec 2020 15:07:18 +0100 Subject: uic: Do not generate QDockWidget::AllDockWidgetFeatures into code The enumeration value was deprecated by qtbase/f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 and removed in Qt 6. Pick-to: 6.0 Task-number: QTBUG-89093 Change-Id: Iaf46adc1e1bd79e4aaab066c9fa4bf84a8ee34d0 Reviewed-by: Volker Hilsheimer --- src/tools/uic/cpp/cppwriteinitialization.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 328fb22c2e..d902052ee4 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1295,8 +1295,13 @@ void WriteInitialization::writeProperties(const QString &varName, qWarning("Widget '%s': Deprecated property QLCDNumber::numDigits encountered. It has been replaced by QLCDNumber::digitCount.", qPrintable(varName)); propertyName = QLatin1String("digitCount"); - } else if (propertyName == QLatin1String("frameShadow")) + } else if (propertyName == QLatin1String("frameShadow")) { frameShadowEncountered = true; + } else if (p->kind() == DomProperty::Set && propertyName == u"features" + && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QDockWidget")) + && p->elementSet() == u"QDockWidget::AllDockWidgetFeatures") { + continue; // ### fixme Qt 7 remove this: Exclude deprecated value of Qt 5. + } bool stdset = m_stdsetdef; if (p->hasAttributeStdset()) -- cgit v1.2.3