Update dependencies

Adapt to changed parameters of QQmlListProperty.

Change-Id: I122993334981f137968f8f9260e456058f1e4ab1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

7 files changed, 20 insertions, 14 deletions

diff --git a/dependencies.yaml b/dependencies.yaml
index f8d3fe1..f5ee6da 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   ../qtbase:
-    ref: 4c36d64bb3a4425848de3f134a8caca3e8d20fe3
+    ref: 8a6f52bf83f7f8e97e4eed7bafbcdfd85a5a5bab
     required: true
   ../qtdeclarative:
-    ref: db9543cff7ac115beb9317f3ab6275c8609941b6
+    ref: 31afb6b70513cc673d17fc72f081f19ac80e7111
     required: false
diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp
index 615af08..fa0c98d 100644
--- a/src/imports/winextras/qquickjumplist.cpp
+++ b/src/imports/winextras/qquickjumplist.cpp
@@ -188,12 +188,13 @@ void QQuickJumpList::data_append(QQmlListProperty<QObject> *property, QObject *o
     }
 }
 
-int QQuickJumpList::categories_count(QQmlListProperty<QQuickJumpListCategory> *property)
+qsizetype QQuickJumpList::categories_count(QQmlListProperty<QQuickJumpListCategory> *property)
 {
     return static_cast<QQuickJumpList *>(property->object)->m_categories.count();
 }
 
-QQuickJumpListCategory *QQuickJumpList::categories_at(QQmlListProperty<QQuickJumpListCategory> *property, int index)
+QQuickJumpListCategory *QQuickJumpList::categories_at(QQmlListProperty<QQuickJumpListCategory> *property,
+                                                      qsizetype index)
 {
     return static_cast<QQuickJumpList *>(property->object)->m_categories.value(index);
 }
diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h
index 25bf2e2..1127980 100644
--- a/src/imports/winextras/qquickjumplist_p.h
+++ b/src/imports/winextras/qquickjumplist_p.h
@@ -99,8 +99,9 @@ private Q_SLOTS:
 
 private:
     static void data_append(QQmlListProperty<QObject> *property, QObject *object);
-    static int categories_count(QQmlListProperty<QQuickJumpListCategory> *property);
-    static QQuickJumpListCategory *categories_at(QQmlListProperty<QQuickJumpListCategory> *property, int index);
+    static qsizetype categories_count(QQmlListProperty<QQuickJumpListCategory> *property);
+    static QQuickJumpListCategory *categories_at(QQmlListProperty<QQuickJumpListCategory> *property,
+                                                 qsizetype index);
 
     QQuickJumpListCategory *m_recent = nullptr;
     QQuickJumpListCategory *m_frequent = nullptr;
diff --git a/src/imports/winextras/qquickjumplistcategory.cpp b/src/imports/winextras/qquickjumplistcategory.cpp
index 30183f4..c848c9e 100644
--- a/src/imports/winextras/qquickjumplistcategory.cpp
+++ b/src/imports/winextras/qquickjumplistcategory.cpp
@@ -139,12 +139,13 @@ void QQuickJumpListCategory::data_append(QQmlListProperty<QObject> *property, QO
     }
 }
 
-int QQuickJumpListCategory::items_count(QQmlListProperty<QQuickJumpListItem> *property)
+qsizetype QQuickJumpListCategory::items_count(QQmlListProperty<QQuickJumpListItem> *property)
 {
     return static_cast<QQuickJumpListCategory *>(property->object)->m_items.count();
 }
 
-QQuickJumpListItem *QQuickJumpListCategory::items_at(QQmlListProperty<QQuickJumpListItem> *property, int index)
+QQuickJumpListItem *QQuickJumpListCategory::items_at(QQmlListProperty<QQuickJumpListItem> *property,
+                                                     qsizetype index)
 {
     return static_cast<QQuickJumpListCategory *>(property->object)->m_items.value(index);
 }
diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h
index 9e1fda7..9ab0d3a 100644
--- a/src/imports/winextras/qquickjumplistcategory_p.h
+++ b/src/imports/winextras/qquickjumplistcategory_p.h
@@ -93,8 +93,9 @@ Q_SIGNALS:
 
 private:
     static void data_append(QQmlListProperty<QObject> *property, QObject *object);
-    static int items_count(QQmlListProperty<QQuickJumpListItem> *property);
-    static QQuickJumpListItem *items_at(QQmlListProperty<QQuickJumpListItem> *property, int index);
+    static qsizetype items_count(QQmlListProperty<QQuickJumpListItem> *property);
+    static QQuickJumpListItem *items_at(QQmlListProperty<QQuickJumpListItem> *property,
+                                        qsizetype index);
 
     bool m_visible = true;
     QString m_title;
diff --git a/src/imports/winextras/qquickthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp
index 7bdf112..ae706a5 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar.cpp
+++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp
@@ -233,12 +233,13 @@ void QQuickThumbnailToolBar::addData(QQmlListProperty<QObject> *property, QObjec
     }
 }
 
-int QQuickThumbnailToolBar::buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property)
+qsizetype QQuickThumbnailToolBar::buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property)
 {
     return static_cast<QQuickThumbnailToolBar *>(property->object)->count();
 }
 
-QQuickThumbnailToolButton *QQuickThumbnailToolBar::buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index)
+QQuickThumbnailToolButton *QQuickThumbnailToolBar::buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property,
+                                                            qsizetype index)
 {
     return static_cast<QQuickThumbnailToolBar *>(property->object)->m_buttons.value(index);
 }
diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h
index fc1e67a..2370b9c 100644
--- a/src/imports/winextras/qquickthumbnailtoolbar_p.h
+++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h
@@ -114,8 +114,9 @@ protected:
 
 private:
     static void addData(QQmlListProperty<QObject> *property, QObject *button);
-    static int buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property);
-    static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index);
+    static qsizetype buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property);
+    static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property,
+                                               qsizetype index);
 
     QWinThumbnailToolBar m_toolbar;
     QList<QQuickThumbnailToolButton *> m_buttons;