diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2019-08-26 17:59:22 +0300 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2019-09-12 14:35:08 +0300 |
| commit | a5be4ae50c40f938ca8660296362fc06cc8273b1 (patch) | |
| tree | 4737ed06a34f3c5140ad6459bed1f64dbe945b3c /src/quicktemplates2/qquickmenu.cpp | |
| parent | c18c7bd7f9596e5ad3d13876a91203e1ceba2544 (diff) | |
Fix timer events handling
if the timer event's timerId isn't recognized,
make sure control passes to the base class
Change-Id: If5988dbf4ccda6a9887805961b439f93640f71ea
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 82cc063f..67e2d806 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -1487,7 +1487,9 @@ void QQuickMenu::timerEvent(QTimerEvent *event) if (QQuickMenu *subMenu = d->currentSubMenu()) subMenu->open(); d->stopHoverTimer(); + return; } + QQuickPopup::timerEvent(event); } QFont QQuickMenu::defaultFont() const |