diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-19 07:58:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-19 09:01:43 +0200 |
| commit | 124dd9adb5882048e44dcd012e08899d4e480196 (patch) | |
| tree | f6022e22f08f2128df2b0cc2081c2b8843408aba /src/quicktemplates2/qquickcontrol_p.h | |
| parent | 6cb2367f01c1f78d760c1a4d70002cf5a5046396 (diff) | |
| parent | d6fbb1239950f392f3d569da7dde226e865b7bcd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
src/imports/controls/material/qquickmaterialstyle.cpp
Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index d3064f54..7187344a 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -177,6 +177,7 @@ protected: void focusInEvent(QFocusEvent *event) override; void focusOutEvent(QFocusEvent *event) override; void hoverEnterEvent(QHoverEvent *event) override; + void hoverMoveEvent(QHoverEvent *event) override; void hoverLeaveEvent(QHoverEvent *event) override; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; |