diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index bd9786ec3a..a8069c0c3b 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -422,7 +422,7 @@ namespace Qt { enum ApplicationAttribute { // AA_ImmediateWidgetCreation = 0, - AA_QtQuickDontUseDefaultSizePolicy = 1, + AA_QtQuickUseDefaultSizePolicy = 1 QT_TECH_PREVIEW_API, AA_DontShowIconsInMenus = 2, AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 2d3f9749fb..7e1536a598 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -84,10 +84,18 @@ QCoreApplication::testAttribute(). - \value [since 6.7] AA_QtQuickDontUseDefaultSizePolicy Qt Quick Layouts won't use the built-in - size policy of \l Item. This restores previous behavior where all items were fixed size - by default. Size policy can be customized by explicitly setting - \l{Layout::fillWidth}{Layout.fillWidth} or \l{Layout::fillHeight}{Layout.fillHeight}. + \value [since 6.7] AA_QtQuickUseDefaultSizePolicy Qt Quick Layouts use the built-in size + policy of \l Item. For example, when this is set, \l Button fills the available + width, but has a fixed height. When this is not set, it will use the default + sizing behavior of the layout it's in, which is to use its implicit size as the + preferred size. This is explained in detail in \l {Specifying preferred size} and + \l {Size constraints}. When this is set, the default size policy of the item + with the layout can be overridden by explicitly setting + \l{Layout::fillWidth}{Layout.fillWidth} or + \l{Layout::fillHeight}{Layout.fillHeight}. + \b Note: This API is considered tech preview and may change or be removed in future + versions of Qt. + \value AA_DontShowIconsInMenus Actions with the Icon property won't be shown in any menus unless specifically set by the |