diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/quick/items/qquickpincharea.cpp | |
parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/quick/items/qquickpincharea.cpp')
-rw-r--r-- | src/quick/items/qquickpincharea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp index f3791a49ee..fd8971c845 100644 --- a/src/quick/items/qquickpincharea.cpp +++ b/src/quick/items/qquickpincharea.cpp @@ -245,7 +245,7 @@ QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate() \since 5.5 This signal is emitted when the pinch area detects the smart zoom gesture. - This gesture occurs only on certain operating systems such as OS X. + This gesture occurs only on certain operating systems such as \macos. The \l {PinchEvent}{pinch} parameter provides information about the pinch gesture, including the location where the gesture occurred. \c pinch.scale |