diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 03:56:47 (GMT) |
| commit | 0c558e05f880cb51078b2d5e5281227352c1de3f (patch) | |
| tree | 809e95ab06fc5d757c1d66493de5c9376866aee1 /src/gui/widgets/qmenu_p.h | |
| parent | af81ea8a5abbd9a94eb6ab5c3fe0425779905d5a (diff) | |
| parent | 48fd47f64f3f73e82016161d82cdf67908a9c653 (diff) | |
| download | Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.zip Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.gz Qt-0c558e05f880cb51078b2d5e5281227352c1de3f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml 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; |