diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:09 +0200 |
| commit | 4f0988c3907406087dbfdc193abfbf767678d814 (patch) | |
| tree | aafd9c98bb248d9920443778bf122ea23b1e4c75 /src/quick/items/qquickgridview.cpp | |
| parent | 32a980a86257021247a742b2b8c0b4aafe6e9035 (diff) | |
| parent | 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7bd70996e3372d154c6b0e47336baa22146667b0
Diffstat (limited to 'src/quick/items/qquickgridview.cpp')
| -rw-r--r-- | src/quick/items/qquickgridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index cb2611199e..fe33019d27 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -2612,7 +2612,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co */ /*! - \qmlmethod int QtQuick::GridView::indexAt(int x, int y) + \qmlmethod int QtQuick::GridView::indexAt(real x, real y) Returns the index of the visible item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, or the item is @@ -2625,7 +2625,7 @@ bool QQuickGridViewPrivate::needsRefillForAddedOrRemovedIndex(int modelIndex) co */ /*! - \qmlmethod Item QtQuick::GridView::itemAt(int x, int y) + \qmlmethod Item QtQuick::GridView::itemAt(real x, real y) Returns the visible item containing the point \a x, \a y in content coordinates. If there is no item at the point specified, or the item is |