diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:01:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:01:05 +0200 |
| commit | e6e4ff8dcf1b00639e87bc0725daa0e1e8ca0510 (patch) | |
| tree | 1d2059c5dfda77d15df6635c7f39d5d334c48756 /src/sensors/gestures/qsensorgesture.cpp | |
| parent | 493fece68d4d0cb6821342cfabdb7ab2bf60be46 (diff) | |
| parent | e48a2a270b74c80744dcff48e889d09bf5cdcc77 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I276110da60bdd32b31ee944df7c60c69371cfed1
Diffstat (limited to 'src/sensors/gestures/qsensorgesture.cpp')
| -rw-r--r-- | src/sensors/gestures/qsensorgesture.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sensors/gestures/qsensorgesture.cpp b/src/sensors/gestures/qsensorgesture.cpp index b643998e..8d5e2ddf 100644 --- a/src/sensors/gestures/qsensorgesture.cpp +++ b/src/sensors/gestures/qsensorgesture.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtSensors module of the Qt Toolkit. @@ -71,12 +71,10 @@ \sa QSensorGestureManager */ -#ifdef Q_QDOC /*! - \fn QSensorGesture::detected(QString gestureId) - Signals when the \a gestureId gesture has been recognized. + \fn void QSensorGesture::detected(QString) + Signals when the gesture has been recognized. */ -#endif /*! Constructs the sensor gesture, and initializes the \a ids list of recognizers, |