summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-08-27 15:49:03 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-08-27 15:49:03 +0200
commit900ce73b6f8db99faa37fb9eceaba3243c08d136 (patch)
tree05b80d9ad645fb82290b731a54a32dd790356d49 /src/gui
parentf71048a5314c93732a8a77460b465709b632ff5e (diff)
parentbd42e2f0cebb2fe8de77a054e9d30aa803749a61 (diff)
Merge 5.11 into 5.11.2
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qevent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index d7727d97b8..4207697c01 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -2750,7 +2750,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.
@@ -4119,7 +4119,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
const QNativeGestureEvent *ne = static_cast<const QNativeGestureEvent *>(e);
dbg << "QNativeGestureEvent(";
QtDebugUtils::formatQEnum(dbg, ne->gestureType());
- dbg << "localPos=";
+ dbg << ", localPos=";
QtDebugUtils::formatQPoint(dbg, ne->localPos());
dbg << ", value=" << ne->value() << ')';
}