diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-04-22 11:51:09 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-04-22 12:28:37 +0200 |
| commit | 7d1b3b23897359b4ba51747229261867993536a8 (patch) | |
| tree | e6fd5a89383535a8cf9b65d07403a2950d839bcd /src/quick/items/context2d | |
| parent | c50113aaf4515c172a1dd2eb30532de088307d78 (diff) | |
| parent | 93bc4113f06dce4c942374d765bef20054cd1f94 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I95266fdaf5c6dc65969bd2e28403da7969367d32
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index dab35f2a54..bda3250c16 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -889,7 +889,7 @@ void QQuickCanvasItem::getContext(QQmlV4Function *args) } /*! - \qmlmethod long QtQuick::Canvas::requestAnimationFrame(callback) + \qmlmethod int QtQuick::Canvas::requestAnimationFrame(callback) This function schedules callback to be invoked before composing the Qt Quick scene. @@ -919,7 +919,7 @@ void QQuickCanvasItem::requestAnimationFrame(QQmlV4Function *args) } /*! - \qmlmethod QtQuick::Canvas::cancelRequestAnimationFrame(long handle) + \qmlmethod QtQuick::Canvas::cancelRequestAnimationFrame(int handle) This function will cancel the animation callback referenced by \a handle. */ |