diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-25 12:00:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-25 12:00:43 +0100 |
| commit | c220203787f7b30d69d9102165dc5d09bc2ac5b6 (patch) | |
| tree | 2c1e4b5ee01a37082417faa0295202364ae2a995 /src/controls/qquickmenupopupwindow_p.h | |
| parent | b834f742994e5dce69c3fdc161099f2ed20deff9 (diff) | |
| parent | a33fe70970d891e096fff6a84d7e0c02f8ee978a (diff) | |
| download | qtquickcontrols-c220203787f7b30d69d9102165dc5d09bc2ac5b6.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I434c0d9c03200ff9ad0abc336c87ea52ea5abd67
Diffstat (limited to 'src/controls/qquickmenupopupwindow_p.h')
| -rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 5cff75af..abee1f83 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -68,6 +68,7 @@ Q_SIGNALS: void willBeDeletedLater(); protected: + void focusInEvent(QFocusEvent *); void exposeEvent(QExposeEvent *); bool shouldForwardEventAfterDismiss(QMouseEvent *) const; |