1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uic: Do not generate QDockWidget::AllDockWidgetFeatures into code

Browse Source 
The enumeration value was deprecated by
qtbase/f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 and removed in Qt 6.

Task-number: QTBUG-89093
Change-Id: Iaf46adc1e1bd79e4aaab066c9fa4bf84a8ee34d0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a5e2f2ddad0cc6b6a06f51e0dce6acf0fecf9de6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2020-12-03 15:07:18 +01:00 committed by Qt Cherry-pick Bot
parent 50fff57377
commit fae0903fe9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -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())