diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:07:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:07:44 +0200 |
commit | 1fbd8b24a525e8db8e6e857b8dcd0bc0241fca5a (patch) | |
tree | f6db45fe9dab3d17dbc6b41e0eba4570c1397168 /src/sensors/gestures/qsensorgesture.cpp | |
parent | f9e12e11274f0969b8829f5e0718960ee0b90114 (diff) | |
parent | 9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I8ee039e82242d46979f8fe7f42164247cf494633
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, |