1 files changed, 14 insertions, 18 deletions
diff --git a/src/templates/qquickmenu.cpp b/src/templates/qquickmenu.cpp
index beda1489..7aeebd2f 100644
--- a/src/templates/qquickmenu.cpp
+++ b/src/templates/qquickmenu.cpp
@@ -68,19 +68,20 @@ QT_BEGIN_NAMESPACE
         id: fileButton
         text: "File"
         onClicked: menu.open()
-    }
-    Menu {
-        id: menu
-        contentItem.y: fileButton.height
 
-        MenuItem {
-            text: "New..."
-        }
-        MenuItem {
-            text: "Open..."
-        }
-        MenuItem {
-            text: "Save"
+        Menu {
+            id: menu
+            y: fileButton.height
+
+            MenuItem {
+                text: "New..."
+            }
+            MenuItem {
+                text: "Open..."
+            }
+            MenuItem {
+                text: "Save"
+            }
         }
     }
     \endcode
@@ -301,8 +302,7 @@ QQuickMenu::QQuickMenu(QObject *parent) :
     QQuickPopup(*(new QQuickMenuPrivate), parent)
 {
     Q_D(QQuickMenu);
-    connect(this, &QQuickMenu::pressedOutside, this, &QQuickMenu::close);
-    connect(this, &QQuickMenu::releasedOutside, this, &QQuickMenu::close);
+    setClosePolicy(OnEscape | OnPressOutside | OnReleaseOutside);
     QObjectPrivate::connect(this, &QQuickMenu::visibleChanged, d, &QQuickMenuPrivate::onMenuVisibleChanged);
 }
 
@@ -513,10 +513,6 @@ bool QQuickMenu::eventFilter(QObject *object, QEvent *event)
             QMetaObject::invokeMethod(d->contentItem, "incrementCurrentIndex");
         return true;
 
-    case Qt::Key_Escape:
-        close();
-        return true;
-
     default:
         break;
     }