src/gui/widgets/qmenu_p.h
changeset 30 5dc02b23752f
parent 25 e24348a560a6
--- a/src/gui/widgets/qmenu_p.h	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/widgets/qmenu_p.h	Tue Jul 06 15:10:48 2010 +0300
@@ -202,7 +202,7 @@
     bool activationRecursionGuard;
 
     //selection
-    static QPointer<QMenu> mouseDown;
+    static QMenu *mouseDown;
     QPoint mousePopupPos;
     uint hasHadMouse : 1;
     uint aboutToHide : 1;
@@ -212,7 +212,7 @@
     QAction *selectAction;
     QAction *cancelAction;
 #endif
-    static QBasicTimer menuDelayTimer;
+    QBasicTimer menuDelayTimer;
     enum SelectionReason {
         SelectedFromKeyboard,
         SelectedFromElsewhere
@@ -272,7 +272,7 @@
     mutable bool hasCheckableItems;
 
     //sloppy selection
-    static QBasicTimer sloppyDelayTimer;
+    static int sloppyDelayTimer;
     mutable QAction *sloppyAction;
     QRegion sloppyRegion;