From fc0bbf8a78c19a71287c5f37a23d74b723fb35c0 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 14 Oct 2020 14:43:47 +0200 Subject: Remove reference to an attached Accessible object for QtObject type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since a QtObject has no meaning as far as accessiblity is concerned then we remove the references to this and change it to be its own property so that the code relying on it still works as before. Fixes: QTBUG-86315 Change-Id: I1531cc4f855d0dac6dd39820b4646851a1267371 Reviewed-by: Tor Arne Vestbø --- src/controls/Private/BasicTableView.qml | 4 ++-- src/controls/TableViewColumn.qml | 2 +- src/extras/Tumbler.qml | 4 ++-- src/extras/TumblerColumn.qml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index 1a4c8416..cd6114a1 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -255,7 +255,7 @@ ScrollView { console.warn(__viewTypeName + "::insertColumn(): you cannot add a column to multiple views") return null } - if (index >= 0 && index <= columnCount && object.Accessible.role === Accessible.ColumnHeader) { + if (index >= 0 && index <= columnCount && object.accessibleRole === Accessible.ColumnHeader) { object.__view = root columnModel.insert(index, {columnItem: object}) if (root.__columns[index] !== object) { @@ -351,7 +351,7 @@ ScrollView { Component.onCompleted: { for (var i = 0; i < __columns.length; ++i) { var column = __columns[i] - if (column.Accessible.role === Accessible.ColumnHeader) + if (column.accessibleRole === Accessible.ColumnHeader) addColumn(column) } } diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index 64e68515..9fa05b3d 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -136,7 +136,7 @@ QtObject { */ property Component delegate - Accessible.role: Accessible.ColumnHeader + property int accessibleRole: Accessible.ColumnHeader /*! \qmlmethod void TableViewColumn::resizeToContents() Resizes the column so that the implicitWidth of the contents on every row will fit. diff --git a/src/extras/Tumbler.qml b/src/extras/Tumbler.qml index fe1dfed1..355d676b 100644 --- a/src/extras/Tumbler.qml +++ b/src/extras/Tumbler.qml @@ -239,7 +239,7 @@ Control { console.warn("Tumbler::insertColumn(): you cannot add a column to multiple Tumblers") return null; } - if (index >= 0 && index <= columnCount && object.Accessible.role === Accessible.ColumnHeader) { + if (index >= 0 && index <= columnCount && object.accessibleRole === Accessible.ColumnHeader) { object.__tumbler = tumbler; object.__index = index; columnModel.insert(index, { columnObject: object }); @@ -259,7 +259,7 @@ Control { Component.onCompleted: { for (var i = 0; i < data.length; ++i) { var column = data[i]; - if (column.Accessible.role === Accessible.ColumnHeader) + if (column.accessibleRole === Accessible.ColumnHeader) addColumn(column); } } diff --git a/src/extras/TumblerColumn.qml b/src/extras/TumblerColumn.qml index 5aa25e81..f630a228 100644 --- a/src/extras/TumblerColumn.qml +++ b/src/extras/TumblerColumn.qml @@ -89,7 +89,7 @@ QtObject { */ property int __currentIndex: -1 - Accessible.role: Accessible.ColumnHeader + property int accessibleRole: Accessible.ColumnHeader /*! \qmlproperty int TumblerColumn::currentIndex -- cgit v1.2.1