summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r--src/corelib/global/qnamespace.qdoc25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f3796639c1..6644ae8e13 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -279,11 +279,6 @@
level windows, unless required by the implementation.
This value was added in Qt 6.8.
- \value AA_DontUsePopupWindows When this attribute is set, popups will always appear
- as items in the scene, rather than having their own dedicated windows.
- Setting this attribute will only affect Qt Quick applications.
- This value was added in Qt 6.8.
-
\omitvalue AA_AttributeCount
\omitvalue AA_EnableHighDpiScaling
\omitvalue AA_UseHighDpiPixmaps
@@ -2087,6 +2082,18 @@
*/
/*!
+ \enum Qt::ContextMenuTrigger
+ \since 6.8
+
+ This enum type defines the mouse event used to trigger a context menu event.
+
+ \value Press context menu on mouse press event, default on UNIX systems.
+ \value Release context menu on mouse release event, default on Windows.
+
+ \sa QStyleHints::contextMenuTrigger
+*/
+
+/*!
\enum Qt::FocusPolicy
This enum type defines the various policies a widget can have with
@@ -3251,7 +3258,7 @@
The underlying type is \c int. You can use \l qToUnderlying() to convert
Qt::TimerId to \c int.
- \value Invalid Represents a no-op timer ID; it's usage depends on the
+ \value Invalid Represents a no-op timer ID; its usage depends on the
context, for example, this is the value returned by QObject::startTimer()
to indicate it failed to start a timer; whereas QChronoTimer::id() returns
this value when the timer is inactive, that is, \c timer.isActive()
@@ -3407,6 +3414,8 @@
\since 6.0
\brief The QKeyCombination class stores a combination of a key with optional modifiers.
+ \compares equality
+
The QKeyCombination class can be used to represent a combination of a key
with zero or more keyboard modifiers.
@@ -3489,14 +3498,14 @@
#endif
/*!
- \fn bool QKeyCombination::operator==(QKeyCombination lhs, QKeyCombination rhs) noexcept
+ \fn bool QKeyCombination::operator==(const QKeyCombination &lhs, const QKeyCombination &rhs)
Returns \c true if \a lhs and \a rhs have the same combination
of key and modifiers, and \c false otherwise.
*/
/*!
- \fn bool QKeyCombination::operator!=(QKeyCombination lhs, QKeyCombination rhs) noexcept
+ \fn bool QKeyCombination::operator!=(const QKeyCombination &lhs, const QKeyCombination &rhs)
Returns \c true if \a lhs and \a rhs have different combinations
of key and modifiers, otherwise \c false.