diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /examples/widgets/painting | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'examples/widgets/painting')
| -rw-r--r-- | examples/widgets/painting/pathstroke/pathstroke.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/widgets/painting/pathstroke/pathstroke.cpp b/examples/widgets/painting/pathstroke/pathstroke.cpp index dc10457d27..1e2f75b2a5 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.cpp +++ b/examples/widgets/painting/pathstroke/pathstroke.cpp @@ -600,6 +600,7 @@ bool PathStrokeRenderer::event(QEvent *e) switch (e->type()) { case QEvent::TouchBegin: touchBegin = true; + Q_FALLTHROUGH(); case QEvent::TouchUpdate: { const QTouchEvent *const event = static_cast<const QTouchEvent*>(e); |