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/quick/util | |
| parent | 707f78086982f15dc4b2d6129f0b983d01cb9626 (diff) | |
| parent | 1d79bef288623fca8c7cc3fc2c49860b6e2abedb (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0d32fc5b99f8c9e4acb922fffe4dd5f3c5be553c
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 6 | ||||
| -rw-r--r-- | src/quick/util/qquickshortcut.cpp | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 763b0aa171..90c725a67f 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -213,8 +213,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const It is only triggered for top-level, standalone animations. It will not be triggered for animations in a Behavior or Transition, or animations that are part of an animation group. - - The corresponding handler is \c onStarted. */ /*! @@ -230,8 +228,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const If \l alwaysRunToEnd is true, this signal will not be emitted until the animation has completed its current iteration. - - The corresponding handler is \c onStopped. */ /*! @@ -250,8 +246,6 @@ QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const If \l alwaysRunToEnd is true, this signal will not be emitted until the animation has completed its current iteration. - The corresponding handler is \c onFinished. - \sa stopped(), started(), running */ diff --git a/src/quick/util/qquickshortcut.cpp b/src/quick/util/qquickshortcut.cpp index 8ef204d179..8e135b4624 100644 --- a/src/quick/util/qquickshortcut.cpp +++ b/src/quick/util/qquickshortcut.cpp @@ -80,16 +80,12 @@ /*! \qmlsignal QtQuick::Shortcut::activated() This signal is emitted when the shortcut is activated. - - The corresponding handler is \c onActivated. */ /*! \qmlsignal QtQuick::Shortcut::activatedAmbiguously() This signal is emitted when the shortcut is activated ambigously, meaning that it matches the start of more than one shortcut. - - The corresponding handler is \c onActivatedAmbiguously. */ static bool qQuickShortcutContextMatcher(QObject *obj, Qt::ShortcutContext context) |