diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-12-03 15:07:18 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-03 18:48:26 +0000 |
| commit | fae0903fe9e536aa639d4c9d0d9801448a0b88ed (patch) | |
| tree | f14063524a50a6aaa4c43f869a46b085eb066ee5 /src/tools | |
| parent | 50fff573777bd32a3ade8e5548c7ec551976593f (diff) | |
uic: Do not generate QDockWidget::AllDockWidgetFeatures into code
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>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 8ba6e12903..31655a6a08 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()) |