diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-10 11:42:25 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-11 10:23:34 +0000 |
| commit | b207f90c3074ef27b10c17cc719d83076bb3d78c (patch) | |
| tree | 91b243a54999d420d3420a2a09987d7f017d0e28 /src/quicktemplates2/qquickmenu_p_p.h | |
| parent | 61aea033d081e372572fa96708bc501ebdec6e8a (diff) | |
Follow up on change of QQmlListProperty to qsizetype
This deals with d7008c79d4ec023527ebfc118ad47f40075f244d in
qtdeclarative which aligned QQmlListProperty with our container types.
Note: not changing the respective APIs of the QQuick classes
in this change. Ie. QQuickPlatformMenu::insertItem still operates on
int as index, and QQuickMenuPrivate still stores currentIndex as int.
This might need to be addressed in a follow-up commit.
Fixes: QTBUG-88362
Change-Id: Ia663cfa47fa91c55997cdef288b2a866107a5f25
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickmenu_p_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index 23b4444cb3..86701d9bef 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. @@ -120,8 +120,8 @@ public: QQuickMenuItem *firstEnabledMenuItem() const; static void contentData_append(QQmlListProperty<QObject> *prop, QObject *obj); - static int contentData_count(QQmlListProperty<QObject> *prop); - static QObject *contentData_at(QQmlListProperty<QObject> *prop, int index); + static qsizetype contentData_count(QQmlListProperty<QObject> *prop); + static QObject *contentData_at(QQmlListProperty<QObject> *prop, qsizetype index); static void contentData_clear(QQmlListProperty<QObject> *prop); QPalette defaultPalette() const override; |