diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
| commit | 2542f8b565e90378145c048b3a6982f4749c6392 (patch) | |
| tree | d48a2a8988a778e16cf73aac4d0b5709b82f0082 /src/gui/widgets/qmenu_p.h | |
| parent | 4f2203e481cc1663776e7b87b082cf0dd42849fd (diff) | |
| parent | 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd (diff) | |
| download | Qt-2542f8b565e90378145c048b3a6982f4749c6392.zip Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.gz Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/widgets/qmenu_p.h')
| -rw-r--r-- | src/gui/widgets/qmenu_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index aaed6b1..276ffe6 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -202,7 +202,7 @@ public: bool activationRecursionGuard; //selection - static QPointer<QMenu> mouseDown; + static QMenu *mouseDown; QPoint mousePopupPos; uint hasHadMouse : 1; uint aboutToHide : 1; @@ -212,7 +212,7 @@ public: QAction *selectAction; QAction *cancelAction; #endif - static QBasicTimer menuDelayTimer; + QBasicTimer menuDelayTimer; enum SelectionReason { SelectedFromKeyboard, SelectedFromElsewhere @@ -272,7 +272,7 @@ public: mutable bool hasCheckableItems; //sloppy selection - static QBasicTimer sloppyDelayTimer; + static int sloppyDelayTimer; mutable QAction *sloppyAction; QRegion sloppyRegion; |