summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-01-30 11:23:56 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-02-12 13:30:01 +0000
commitce10188aa97cbb8f5945e169a2bca1407f8b825e (patch)
tree815fb8d6de6a463aa74404929614fff10898d743 /src/corelib/global
parent98aae7428d86155a596c4318643752477d7726ad (diff)
Expose TabFocusBehavior in QStyleHints
TabAllWidgets in QPlatformTheme is replaced by TabFocusBehavior. [ChangeLog][QtGui] Expose TabFocusBehavior in QStyleHints Change-Id: Iafaad7c6a5c6bc888d1e124e6ddcdbdc46f37b1c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h8
-rw-r--r--src/corelib/global/qnamespace.qdoc13
2 files changed, 21 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index d839d6ed47..2cde1bae81 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -173,6 +173,13 @@ public:
WheelFocus = StrongFocus | 0x4
};
+ enum TabFocusBehavior {
+ NoTabFocus = 0x00,
+ TabFocusTextControls = 0x01,
+ TabFocusListControls = 0x02,
+ TabFocusAllControls = 0xff
+ };
+
enum SortOrder {
AscendingOrder,
DescendingOrder
@@ -1686,6 +1693,7 @@ public:
QT_Q_ENUM(TimerType)
QT_Q_ENUM(ScrollPhase)
QT_Q_ENUM(MouseEventSource)
+ QT_Q_ENUM(TabFocusBehavior)
#endif // Q_DOC
}
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 98cc51fc3f..1be83caa06 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1930,6 +1930,19 @@
*/
/*!
+ \enum Qt::TabFocusBehavior
+ \since 5.5
+
+ This enum type provides different focus behaviors for tab navigation.
+
+ \value NoTabFocus iterate nothing.
+ \value TabFocusTextControls iterate text controls and widgets.
+ \value TabFocusListControls iterate list controls and widgets.
+ \value TabFocusAllControls iterate all controls and widgets.
+
+*/
+
+/*!
\enum Qt::ShortcutContext
For a QEvent::Shortcut event to occur, the shortcut's key sequence