diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:46 +0200 |
| commit | 6dd8ac17197a501fbad58c4468b1dd9a64a3fec8 (patch) | |
| tree | 913181de10c71d5616e403a407dd25d0c8809077 /src/quicktemplates2/qquickmenu.cpp | |
| parent | b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 (diff) | |
| parent | fa0a2860e9ca7bb035fec21ceb0dfe919c7d0dca (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Ib55ecb95e5ae47cc7a46f136a2f2eb158676ea34
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 96d6f269..498c6d00 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -173,6 +173,19 @@ static const int SUBMENU_DELAY = 225; \sa {Customizing Menu}, MenuItem, {Menu Controls}, {Popup Controls} */ +/*! + \qmlproperty bool QtQuick.Controls::Menu::focus + + This property holds whether the popup wants focus. + + When the popup actually receives focus, \l activeFocus will be \c true. + For more information, see \l {Keyboard Focus in Qt Quick}. + + The default value is \c false. + + \sa activeFocus +*/ + static const QQuickPopup::ClosePolicy cascadingSubMenuClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent; static bool shouldCascade() |