diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
| commit | 46f3cc477fc00aae887f085e063d6cb10bfdcd4c (patch) | |
| tree | 0585601759ccbae2ed2abecedaf16e06b80676d0 /src/controls/qquickmenupopupwindow_p.h | |
| parent | 4c184095d378622fb0c3bb1692b331b3cc04e010 (diff) | |
| parent | 04e000d2b1719696581bb4ae6ec21e39236ef38c (diff) | |
| download | qtquickcontrols-46f3cc477fc00aae887f085e063d6cb10bfdcd4c.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
src/controls/qquickaction.cpp
Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
Diffstat (limited to 'src/controls/qquickmenupopupwindow_p.h')
| -rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 30a71fb2..4407fdec 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -81,11 +81,14 @@ protected: void mousePressEvent(QMouseEvent *); void mouseReleaseEvent(QMouseEvent *); void mouseMoveEvent(QMouseEvent *); + void exposeEvent(QExposeEvent *); + void hideEvent(QHideEvent *); private: void forwardEventToTransientParent(QMouseEvent *); bool m_mouseMoved; + bool m_needsActivatedEvent; QQuickItem *m_itemAt; QPointF m_oldItemPos; QQuickItem *m_parentItem; |