diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 13 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 20 |
2 files changed, 3 insertions, 30 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 87e5153964..0dd48ef7fe 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -491,24 +491,17 @@ namespace Qt { enum ApplicationAttribute { - AA_ImmediateWidgetCreation = 0, -#if QT_DEPRECATED_SINCE(5, 14) - AA_MSWindowsUseDirect3DByDefault Q_DECL_ENUMERATOR_DEPRECATED = 1, -#endif + // AA_ImmediateWidgetCreation = 0, + // AA_MSWindowsUseDirect3DByDefault = 1, AA_DontShowIconsInMenus = 2, AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, AA_PluginApplication = 5, -#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me - AA_MacPluginApplication Q_DECL_ENUMERATOR_DEPRECATED = AA_PluginApplication, -#endif AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, AA_Use96Dpi = 8, AA_DisableNativeVirtualKeyboard = 9, -#if QT_DEPRECATED_SINCE(5, 14) - AA_X11InitThreads Q_DECL_ENUMERATOR_DEPRECATED = 10, -#endif + // AA_X11InitThreads = 10, AA_SynthesizeTouchForUnhandledMouseEvents = 11, AA_SynthesizeMouseForUnhandledTouchEvents = 12, AA_UseHighDpiPixmaps = 13, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 73c3f8c483..d19366dabb 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -293,26 +293,6 @@ Currently supported on the Windows platform only. This value was added in 5.15 - The following values are deprecated or obsolete: - - \value AA_ImmediateWidgetCreation This attribute is no longer fully - supported in Qt 5. It ensures that widgets are created - as soon as they are constructed. By default, resources for - widgets are allocated on demand to improve efficiency and - minimize resource usage. Setting or clearing this attribute - affects widgets constructed after the change. Setting it - tells Qt to create toplevel windows immediately. - Therefore, if it is important to minimize resource - consumption, do not set this attribute. - - \value AA_MacPluginApplication This attribute has been deprecated. - Use AA_PluginApplication instead. - - \value AA_MSWindowsUseDirect3DByDefault This value is obsolete and - has no effect. - - \value AA_X11InitThreads This value is obsolete and has no effect. - \omitvalue AA_AttributeCount */ |