diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:07 +0100 |
| commit | 9bd034ea01d01dcc4598c3e3e25e91d0b53a2cda (patch) | |
| tree | 5b7ca3a1477b0d7733a16abcecf85043a88c442d /src/qml/types | |
| parent | 707f78086982f15dc4b2d6129f0b983d01cb9626 (diff) | |
| parent | 1d79bef288623fca8c7cc3fc2c49860b6e2abedb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0d32fc5b99f8c9e4acb922fffe4dd5f3c5be553c
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmltimer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index af2ff56f2a..bf2c414cb4 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -313,8 +313,6 @@ void QQmlTimer::componentComplete() \qmlsignal QtQml::Timer::triggered() This signal is emitted when the Timer times out. - - The corresponding handler is \c onTriggered. */ void QQmlTimer::ticked() { |