summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.qdoc
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-30 18:00:45 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-20 09:03:32 +0200
commitf22ad1afec27d72c21b20a5fef4f67975cdaa46d (patch)
tree725ce2506080672f9f7b3ca1008f387f28e821b0 /src/corelib/global/qnamespace.qdoc
parenta84589cb69504cb1737cc479b6fd8c6c244347c3 (diff)
Tidy up qnamespace.qdoc's enums' \omitvalue entries
Moved \omitvalue entries to the end (unless there was only one, at the start). Sorted Qt::WidgetAttribute's to match their order in the declaration, as there were many and their order was haphazard. Change-Id: I41d27df0fc293f642f931177b0d8884fbbcb9b77 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r--src/corelib/global/qnamespace.qdoc75
1 files changed, 36 insertions, 39 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index b221a8c226..d148d643e7 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -362,6 +362,7 @@
\value ExtraButton23 The 26th non-wheel Mouse Button.
\value ExtraButton24 The 27th non-wheel Mouse Button.
+ \omitvalue MidButton
\omitvalue MaxMouseButton
\omitvalue MouseButtonMask
@@ -803,11 +804,6 @@
different colors than the size of the color table of the destination format.
\value AutoDither (default) - Only dither when down-converting to 1 or 8-bit indexed formats.
- \omitvalue ColorMode_Mask
- \omitvalue Dither_Mask
- \omitvalue AlphaDither_Mask
- \omitvalue DitherMode_Mask
-
\value NoOpaqueDetection Do not check whether the image contains non-opaque
pixels. Use this if you know that the image is semi-transparent and
you want to avoid the overhead of checking the pixels in the image
@@ -819,6 +815,11 @@
Can be useful when converting a QImage to a QPixmap for a one-time
rendering operation for example. Note that a QPixmap not in the
preferred format will be much slower as a paint device.
+
+ \omitvalue ColorMode_Mask
+ \omitvalue Dither_Mask
+ \omitvalue AlphaDither_Mask
+ \omitvalue DitherMode_Mask
*/
/*!
@@ -927,9 +928,6 @@
\value WA_DontShowOnScreen Indicates that the widget is hidden or is
not a part of the viewable Desktop.
- \omitvalue WA_DropSiteRegistered
- \omitvalue WA_ForceAcceptDrops
-
\value WA_ForceDisabled Indicates that the widget is
explicitly disabled, i.e. it will remain disabled even when all
its ancestors are set to the enabled state. This implies
@@ -942,9 +940,8 @@
This implies WA_UpdatesDisabled. This is set/cleared by
QWidget::setUpdatesEnabled().
- \value WA_GroupLeader
- \e{This attribute has been deprecated.} Use QWidget::windowModality
- instead.
+ \value WA_GroupLeader \e{This attribute has been deprecated.} Use
+ QWidget::windowModality instead.
\value WA_Hover Forces Qt to generate paint events when the mouse
enters or leaves the widget. This feature is typically used when
@@ -1016,8 +1013,6 @@
\value WA_MacBrushedMetal This value is obsolete and has no effect.
- \omitvalue WA_MacMetalStyle
-
\value WA_Mapped Indicates that the widget is mapped on screen.
This is set/cleared by the Qt kernel.
@@ -1296,45 +1291,47 @@
underneath. It is strongly recommended to call update() on the widget's
top-level window after enabling or disabling this attribute.
- \omitvalue WA_SetLayoutDirection
- \omitvalue WA_InputMethodTransparent
- \omitvalue WA_WState_CompressKeys
- \omitvalue WA_WState_ConfigPending
- \omitvalue WA_WState_Created
- \omitvalue WA_WState_DND
- \omitvalue WA_WState_ExplicitShowHide
- \omitvalue WA_WState_Hidden
- \omitvalue WA_WState_InPaintEvent
- \omitvalue WA_WState_OwnSizePolicy
- \omitvalue WA_WState_Polished
- \omitvalue WA_WState_Reparented
+ \value WA_ContentsMarginsRespectsSafeArea A QWidget respects the safe
+ area margins of a window by incorporating the margins into its contents'
+ margins by default. This means, that a QLayout will use the content area
+ of a widget for its layout, unless the Qt::WA_LayoutOnEntireRect attribute
+ is set. This along with a contents margin of 0 can be used on the actual
+ layout, to allow for example a background image to underlay the status bar and other
+ system areas on an iOS device, while still allowing child widgets of
+ that background to be inset based on the safe area.
+
+ \omitvalue WA_LaidOut
\omitvalue WA_WState_Visible
- \omitvalue WA_SetWindowIcon
+ \omitvalue WA_WState_Hidden
\omitvalue WA_PendingUpdate
- \omitvalue WA_LaidOut
- \omitvalue WA_GrabbedShortcut
- \omitvalue WA_DontShowOnScreen
\omitvalue WA_InvalidSize
+ \omitvalue WA_GrabbedShortcut
+ \omitvalue WA_SetWindowIcon
+ \omitvalue WA_SetLayoutDirection
\omitvalue WA_ForceUpdatesDisabled
+ \omitvalue WA_WState_Created
+ \omitvalue WA_WState_CompressKeys
+ \omitvalue WA_WState_InPaintEvent
+ \omitvalue WA_WState_Reparented
+ \omitvalue WA_WState_ConfigPending
+ \omitvalue WA_WState_Polished
+ \omitvalue WA_WState_OwnSizePolicy
+ \omitvalue WA_WState_ExplicitShowHide
+ \omitvalue WA_InputMethodTransparent
+ \omitvalue WA_DropSiteRegistered
+ \omitvalue WA_ForceAcceptDrops
\omitvalue WA_NoX11EventCompression
\omitvalue WA_TintedBackground
\omitvalue WA_X11OpenGLOverlay
\omitvalue WA_CanHostQMdiSubWindowTitleBar
- \omitvalue WA_AttributeCount
- \omitvalue WA_StyleSheet
\omitvalue WA_X11BypassTransientForHint
+ \omitvalue WA_DontShowOnScreen
\omitvalue WA_SetWindowModality
\omitvalue WA_WState_WindowOpacitySet
\omitvalue WA_WState_AcceptedTouchBeginEvent
\omitvalue WA_MacNoShadow
- \value WA_ContentsMarginsRespectsSafeArea A QWidget respects the safe
- area margins of a window by incorporating the margins into its contents'
- margins by default. This means, that a QLayout will use the content area
- of a widget for its layout, unless the Qt::WA_LayoutOnEntireRect attribute
- is set. This along with a contents margin of 0 can be used on the actual
- layout, to allow for example a background image to underlay the status bar and other
- system areas on an iOS device, while still allowing child widgets of
- that background to be inset based on the safe area.
+ \omitvalue WA_StyleSheet
+ \omitvalue WA_AttributeCount
*/
/*! \typedef Qt::HANDLE