diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
| commit | 89f8e1f54ff1f7e033f9a9da232bcb4c72b1e45f (patch) | |
| tree | 570a9c7aa1d53b7d38ecb74b856203e19df59c52 /src/quicktemplates2/qquickmenu.cpp | |
| parent | 48d24fe2e4d6ce6d91805a3425be0954126acc84 (diff) | |
| parent | d091c75c0b953a8b91c57f075769036bd09ae4c2 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickmenu.cpp
Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 4afac541..14449ad5 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -170,10 +170,8 @@ static const int SUBMENU_DELAY = 225; \sa {Customizing Menu}, {Menu Controls}, {Popup Controls} */ -static const QQuickPopup::ClosePolicy defaultMenuClosePolicy = - QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside | QQuickPopup::CloseOnReleaseOutside; -static const QQuickPopup::ClosePolicy cascadingSubMenuClosePolicy = - QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent | QQuickPopup::CloseOnReleaseOutsideParent; +static const QQuickPopup::ClosePolicy defaultMenuClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside; +static const QQuickPopup::ClosePolicy cascadingSubMenuClosePolicy = QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent; static bool shouldCascade() { @@ -596,7 +594,6 @@ QQuickMenu::QQuickMenu(QObject *parent) : QQuickPopup(*(new QQuickMenuPrivate), parent) { setFocus(true); - setClosePolicy(defaultMenuClosePolicy); } /*! |