diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-04 09:57:15 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-04 09:58:30 (GMT) |
| commit | 625f6b92a08d8ef2a1e5697fce28ca39d29917fe (patch) | |
| tree | 85850b633d9d06ae48b33ec266ae0386942120b4 /src/gui/widgets/qmenu_p.h | |
| parent | a99fe8624a25f8a09fe9b3234306a4d8b3a3f38e (diff) | |
| download | Qt-625f6b92a08d8ef2a1e5697fce28ca39d29917fe.zip Qt-625f6b92a08d8ef2a1e5697fce28ca39d29917fe.tar.gz Qt-625f6b92a08d8ef2a1e5697fce28ca39d29917fe.tar.bz2 | |
Fixes QMenu to only have static POD members
This also fixes the autotests
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; |