diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-24 23:59:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-24 23:59:46 +0200 |
| commit | 1d077120f48cc1ad10fc31c2381b0b65a085c217 (patch) | |
| tree | f815cd94a96aa006d9fb38ee70958691ad6c2155 /src/gui | |
| parent | 7af0ea5b0f883415927727c8ed10bb6256d1f12d (diff) | |
| parent | bd42e2f0cebb2fe8de77a054e9d30aa803749a61 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I5f1567c792992fc00f0256f39b76cfbe017e6a3a
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 6f8ea6dc70..0e35fb7d7b 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2789,7 +2789,7 @@ Qt::MouseButtons QTabletEvent::buttons() const \header \li Event Type \li Description - \li Touch equence + \li Touch sequence \row \li Qt::ZoomNativeGesture \li Magnification delta in percent. |