diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 11:04:31 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 12:55:06 +0200 |
commit | 22556f899ffd91650c1a1d5a8d71016358291859 (patch) | |
tree | 320dfdcd26a3cd078738da5a0ab9b8ea373fde29 /src/webengine/ui | |
parent | b715310a4fdc2a5e215c99bae042cd820e9a1e27 (diff) | |
parent | dc16cdd60449112343d43852960142db7fd155fd (diff) |
Merge branch '5.5' into 5.6
Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
Diffstat (limited to 'src/webengine/ui')
-rw-r--r-- | src/webengine/ui/Menu.qml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/webengine/ui/Menu.qml b/src/webengine/ui/Menu.qml index e6fec297f..6ecf650e8 100644 --- a/src/webengine/ui/Menu.qml +++ b/src/webengine/ui/Menu.qml @@ -38,8 +38,17 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 as Controls Controls.Menu { + id: menu signal done() // Use private API for now - onAboutToHide: done(); + onAboutToHide: doneTimer.start(); + + // WORKAROUND On Mac the Menu may be destroyed before the MenuItem + // is actually triggered (see qtbase commit 08cc9b9991ae9ab51) + Timer { + id: doneTimer + interval: 100 + onTriggered: menu.done() + } } |