diff options
| author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-11-11 15:06:50 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2015-11-12 08:34:04 +0000 |
| commit | 0d2066ff8459f00af8f8195780d064023b8d1c38 (patch) | |
| tree | 4d50f389f82d17b7417aa2e58d0d3b20f7a928ed | |
| parent | 3660cd60e9a8f74203b2eefef23f4baa383f75c3 (diff) | |
| download | qtquickcontrols-0d2066ff8459f00af8f8195780d064023b8d1c38.tar.gz | |
qquickmenu: don't dismiss a native menu from __dismissAndDestroy
Task-number: QTBUG-49365
Change-Id: I34509ce9d961f0afb5c2f935af6dc4e574c39a77
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| -rw-r--r-- | src/controls/qquickmenu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index fec24189..bc9e7c5d 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -593,6 +593,9 @@ void QQuickMenu::__closeAndDestroy() void QQuickMenu::__dismissAndDestroy() { + if (m_platformMenu) + return; + __dismissMenu(); destroyAllMenuPopups(); } |