diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 01138e58ed..dbd0c20282 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -82,9 +82,6 @@ namespace Qt { LeftButton = 0x00000001, RightButton = 0x00000002, MiddleButton = 0x00000004, -#if QT_DEPRECATED_SINCE(5, 15) // commented as such since 4.7.0 - MidButton Q_DECL_ENUMERATOR_DEPRECATED_X("MidButton is deprecated. Use MiddleButton instead") = MiddleButton, -#endif BackButton = 0x00000008, XButton1 = BackButton, ExtraButton1 = XButton1, @@ -308,22 +305,15 @@ namespace Qt { WA_Disabled = 0, WA_UnderMouse = 1, WA_MouseTracking = 2, -#if QT_DEPRECATED_SINCE(5, 15) // commented as such since 4.5.1 - WA_ContentsPropagated Q_DECL_ENUMERATOR_DEPRECATED = 3, -#endif + // Formerly, 3 was WA_ContentsPropagated. WA_OpaquePaintEvent = 4, -#if QT_DEPRECATED_SINCE(5, 14) - WA_NoBackground Q_DECL_ENUMERATOR_DEPRECATED = WA_OpaquePaintEvent, -#endif WA_StaticContents = 5, WA_LaidOut = 7, WA_PaintOnScreen = 8, WA_NoSystemBackground = 9, WA_UpdatesDisabled = 10, WA_Mapped = 11, -#if QT_DEPRECATED_SINCE(5, 14) - WA_MacNoClickThrough Q_DECL_ENUMERATOR_DEPRECATED = 12, -#endif + // Formerly, 12 was WA_MacNoClickThrough. WA_InputMethodEnabled = 14, WA_WState_Visible = 15, WA_WState_Hidden = 16, @@ -341,10 +331,7 @@ namespace Qt { WA_Moved = 43, WA_PendingUpdate = 44, WA_InvalidSize = 45, -#if QT_DEPRECATED_SINCE(5, 14) - WA_MacBrushedMetal Q_DECL_ENUMERATOR_DEPRECATED = 46, - WA_MacMetalStyle Q_DECL_ENUMERATOR_DEPRECATED = 46, -#endif + // Formerly 46 was WA_MacBrushedMetal and WA_MacMetalStyle. WA_CustomWhatsThis = 47, WA_LayoutOnEntireRect = 48, WA_OutsideWSRange = 49, @@ -365,9 +352,7 @@ namespace Qt { WA_WState_Reparented = 63, WA_WState_ConfigPending = 64, WA_WState_Polished = 66, -#if QT_DEPRECATED_SINCE(5, 15) // commented as such in 4.5.1 - WA_WState_DND Q_DECL_ENUMERATOR_DEPRECATED = 67, -#endif + // Formerly, 67 was WA_WState_DND. WA_WState_OwnSizePolicy = 68, WA_WState_ExplicitShowHide = 69, @@ -383,9 +368,6 @@ namespace Qt { WA_AcceptDrops = 78, WA_DropSiteRegistered = 79, // internal -#if QT_DEPRECATED_SINCE(5, 15) // commented as such since 4.5.1 - WA_ForceAcceptDrops Q_DECL_ENUMERATOR_DEPRECATED_X("WA_ForceAcceptDrops is deprecated. Use WA_DropSiteRegistered instead") = WA_DropSiteRegistered, -#endif WA_WindowPropagation = 80, @@ -405,9 +387,7 @@ namespace Qt { WA_LayoutUsesWidgetRect = 92, WA_StyledBackground = 93, // internal -#if QT_DEPRECATED_SINCE(5, 14) - WA_MSWindowsUseDirect3D Q_DECL_ENUMERATOR_DEPRECATED = 94, -#endif + // Formerly, 94 was WA_MSWindowsUseDirect3D. WA_CanHostQMdiSubWindowTitleBar = 95, // Internal WA_MacAlwaysShowToolWindow = 96, // Mac only @@ -439,9 +419,7 @@ namespace Qt { WA_X11NetWmWindowTypeNotification = 114, WA_X11NetWmWindowTypeCombo = 115, WA_X11NetWmWindowTypeDND = 116, -#if QT_DEPRECATED_SINCE(5, 14) - WA_MacFrameworkScaled Q_DECL_ENUMERATOR_DEPRECATED = 117, -#endif + // Formerly, 117 was WA_MacFrameworkScaled. WA_SetWindowModality = 118, WA_WState_WindowOpacitySet = 119, // internal WA_TranslucentBackground = 120, @@ -1388,9 +1366,6 @@ namespace Qt { enum InputMethodQuery { ImEnabled = 0x1, ImCursorRectangle = 0x2, -#if QT_DEPRECATED_SINCE(5, 14) - ImMicroFocus Q_DECL_ENUMERATOR_DEPRECATED = 0x2, -#endif ImFont = 0x4, ImCursorPosition = 0x8, ImSurroundingText = 0x10, @@ -1545,9 +1520,6 @@ namespace Qt { ItemIsUserCheckable = 16, ItemIsEnabled = 32, ItemIsAutoTristate = 64, -#if QT_DEPRECATED_SINCE(5, 6) - ItemIsTristate = ItemIsAutoTristate, -#endif ItemNeverHasChildren = 128, ItemIsUserTristate = 256 }; @@ -1560,9 +1532,6 @@ namespace Qt { MatchStartsWith = 2, MatchEndsWith = 3, MatchRegularExpression = 4, -#if QT_DEPRECATED_SINCE(5, 15) - MatchRegExp Q_DECL_ENUMERATOR_DEPRECATED_X("MatchRegExp is deprecated. Use MatchRegularExpression instead") = MatchRegularExpression, -#endif MatchWildcard = 5, MatchFixedString = 8, MatchCaseSensitive = 16, @@ -1573,9 +1542,6 @@ namespace Qt { Q_DECLARE_OPERATORS_FOR_FLAGS(MatchFlags) typedef void * HANDLE; -#if QT_DEPRECATED_SINCE(5, 0) - typedef WindowFlags WFlags; -#endif enum WindowModality { NonModal, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6532f3bbab..b8c9854555 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -316,7 +316,6 @@ left-handed mice.) \value RightButton The right button. \value MiddleButton The middle button. - \omitvalue MidButton \value BackButton The 'Back' button. (Typically present on the 'thumb' side of a mouse with extra buttons. This is NOT @@ -354,7 +353,6 @@ \value ExtraButton23 The 26th non-wheel Mouse Button. \value ExtraButton24 The 27th non-wheel Mouse Button. - \omitvalue MidButton \omitvalue MaxMouseButton \omitvalue MouseButtonMask @@ -901,10 +899,6 @@ \value WA_AlwaysShowToolTips Enables tooltips for inactive windows. - \value WA_ContentsPropagated This flag is superfluous and - obsolete; it no longer has any effect. Since Qt 4.1, all widgets - that do not set WA_PaintOnScreen propagate their contents. - \value WA_CustomWhatsThis Indicates that the widget wants to continue operating normally in "What's This?" mode. This is set by the widget's author. @@ -974,8 +968,6 @@ \value WA_LayoutUsesWidgetRect Ignore the layout item rect from the style when laying out this widget with QLayout. - \value WA_MacNoClickThrough This value is obsolete and has no effect. - \value WA_MacOpaqueSizeGrip Indicates that the native size grip should be opaque instead of transparent (the default). This attribute is only applicable to \macos and is set by the widget's author. @@ -1003,8 +995,6 @@ alternative sizes for widgets to avoid clipping. This attribute is only applicable to \macos. - \value WA_MacBrushedMetal This value is obsolete and has no effect. - \value WA_Mapped Indicates that the widget is mapped on screen. This is set/cleared by the Qt kernel. @@ -1020,12 +1010,6 @@ position. This is set/cleared by QWidget::move() and by QWidget::setGeometry(). - \value WA_MSWindowsUseDirect3D This value is obsolete and has no - effect. - - \value WA_NoBackground This value is obsolete. Use - WA_OpaquePaintEvent instead. - \value WA_NoChildEventsForParent Indicates that the widget does not want ChildAdded or ChildRemoved events sent to its parent. This is rarely necessary but can help to avoid automatic @@ -1262,8 +1246,6 @@ has no effect on non-X11 platforms. \b Note: Qt automatically sets this attribute on the feedback widget used during a drag. - \value WA_MacFrameworkScaled This value is obsolete and has no effect. - \value WA_AcceptTouchEvents Allows touch events (see QTouchEvent) to be sent to the widget. Must be set on all widgets that can handle touch events. Without this attribute set, events from a @@ -2083,14 +2065,6 @@ the applications windows are active. */ -/*! - \typedef Qt::WFlags - \obsolete - This typedef is obsolete. Use Qt::WindowFlags instead. - - Synonym for Qt::WindowFlags. -*/ - /*! \enum Qt::WindowType @@ -2638,7 +2612,6 @@ \enum Qt::InputMethodQuery \value ImEnabled The widget accepts input method input. - \value ImMicroFocus This query is obsolete. Use \c ImCursorRectangle instead. \value ImCursorRectangle The rectangle covering the area of the input cursor in widget coordinates. \value ImFont The currently used font for text input. \value ImCursorPosition The logical position of the cursor within the text surrounding the input area @@ -2781,8 +2754,6 @@ This enables automatic management of the state of parent items in QTreeWidget (checked if all children are checked, unchecked if all children are unchecked, or partially checked if only some children are checked). - \value ItemIsTristate \e{This enum value is deprecated.} Use Qt::ItemIsAutoTristate - instead. \value ItemNeverHasChildren The item never has child items. This is used for optimization purposes only. \value ItemIsUserTristate The user can cycle through three separate states. @@ -2814,8 +2785,6 @@ \value MatchStartsWith The search term matches the start of the item. \value MatchEndsWith The search term matches the end of the item. \value MatchCaseSensitive The search is case sensitive. - \value MatchRegExp Same as MatchRegularExpression - \e{This enum value is deprecated since Qt 5.15.} \value MatchRegularExpression Performs string-based matching using a regular expression as the search term. Uses QRegularExpression. When using this flag, a QRegularExpression object can be passed as diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2f42ded8d8..dc7f8f7dc4 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -843,7 +843,6 @@ QWidgetSet *QWidgetPrivate::allWidgets = nullptr; // widgets with no wid \li Qt::WA_WState_InPaintEvent Currently processing a paint event. \li Qt::WA_WState_Reparented The widget has been reparented. \li Qt::WA_WState_ConfigPending A configuration (resize/move) event is pending. - \li Qt::WA_WState_DND (Deprecated) The widget supports drag and drop, see setAcceptDrops(). \endlist */