QMenuPrivate: Make sloppyDelayTimer non-static
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>
Tue, 18 Mar 2014 11:50:23 +0000 (12:50 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 20 Mar 2014 10:24:16 +0000 (11:24 +0100)
commit020d873a5753c4c147d11ac98682d270554e1d05
tree40a770a6b67abb9906b0b31ac07202e2c763cc62
parent7fb4fefc037deac4864beb6b17476191c0b13f36
QMenuPrivate: Make sloppyDelayTimer non-static

Keeping the timer static would trigger warnings when enabling
SH_Menu_SloppySubMenus in QCommonStyle in a forthcoming patch.
This would happen if we opened a second level submenu quickly
enough and get the mouse event handler to reset the timer its
parent menu started.

This is a backport of Ia768603b40b219f87138c60a595c65ef408761ae
from qt/qtbase.

Change-Id: Ia7e9a94b3445d9362a60a36d5e4dda878ab0f7a5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/gui/widgets/qmenu.cpp
src/gui/widgets/qmenu_p.h