diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 13:19:30 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-11 13:19:30 +0200 |
| commit | 3408d28e3c058c620f4dfb167a1e25c3618fc90f (patch) | |
| tree | f70f55faf78e89e2260f7464868c0feefbbf647a /src/quicktemplates2/qquickscrollbar_p.h | |
| parent | 40f59da21a74b5999db90e1eb7073f292ac3e54e (diff) | |
| parent | 880475bbe620a533db7b7b744e0b4c98fbf34d1b (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickcontrol.cpp
Change-Id: I73a9946da4214dcb8c877e716af5a8bb64335f69
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 523e27f0..d7457876 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -139,6 +139,8 @@ protected: void mouseMoveEvent(QMouseEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; void mouseUngrabEvent() override; + void touchEvent(QTouchEvent *event) override; + void touchUngrabEvent() override; #if QT_CONFIG(quicktemplates2_hover) void hoverChange() override; |