diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-11 08:39:04 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-11 08:56:24 +0100 |
| commit | 33f996ba807961f0d76aff32fe243aaf94b89263 (patch) | |
| tree | 77cc9973ee084ad7f35716a237817bbbba101e70 /src | |
| parent | cccdaadd15cb99147f1d5d9fd91015b749424f79 (diff) | |
Adjust to QQmlListProperty working with qsizetype
This is necessary after d7008c79d4ec023527ebfc118ad47f40075f244d in
declarative, which aligned QQmlListProperty with our containers.
Fixes: QTBUG-88363
Change-Id: I6c377396870b9af2614e1e05e69cde2a3cc13e2c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositorquickextensions_p.h | 4 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickchildren.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositorquickextensions_p.h b/src/compositor/compositor_api/qwaylandcompositorquickextensions_p.h index 4a1763884..184267135 100644 --- a/src/compositor/compositor_api/qwaylandcompositorquickextensions_p.h +++ b/src/compositor/compositor_api/qwaylandcompositorquickextensions_p.h @@ -77,12 +77,12 @@ public: &clearFunction); } - static int countFunction(QQmlListProperty<QWaylandCompositorExtension> *list) + static qsizetype countFunction(QQmlListProperty<QWaylandCompositorExtension> *list) { return static_cast<QWaylandQuickCompositorQuickExtensionContainer *>(list->data)->extension_vector.size(); } - static QWaylandCompositorExtension *atFunction(QQmlListProperty<QWaylandCompositorExtension> *list, int index) + static QWaylandCompositorExtension *atFunction(QQmlListProperty<QWaylandCompositorExtension> *list, qsizetype index) { return static_cast<QWaylandQuickCompositorQuickExtensionContainer *>(list->data)->extension_vector.at(index); } diff --git a/src/compositor/compositor_api/qwaylandquickchildren.h b/src/compositor/compositor_api/qwaylandquickchildren.h index e6592718c..9c965b81f 100644 --- a/src/compositor/compositor_api/qwaylandquickchildren.h +++ b/src/compositor/compositor_api/qwaylandquickchildren.h @@ -66,11 +66,11 @@ QT_BEGIN_NAMESPACE { \ static_cast<className *>(list->data)->m_children.append(object); \ } \ - static int countFunction(QQmlListProperty<QObject> *list) \ + static qsizetype countFunction(QQmlListProperty<QObject> *list) \ { \ return static_cast<className *>(list->data)->m_children.size(); \ } \ - static QObject *atFunction(QQmlListProperty<QObject> *list, int index) \ + static QObject *atFunction(QQmlListProperty<QObject> *list, qsizetype index) \ { \ return static_cast<className *>(list->data)->m_children.at(index); \ } \ |