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.h | |
| 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.h')
| -rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index de727954..53de7630 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -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. @@ -80,12 +80,10 @@ private: const QMetaObject *metaObject() const override; int qt_metacall(QMetaObject::Call, int, void **) override; -#ifdef Q_QDOC Q_SIGNALS: // these signals are created at runtime, along with // gesture recognizer specific signals. void detected(QString); -#endif }; QT_END_NAMESPACE |