diff --git a/src/controls/PageStack.qml b/src/controls/PageStack.qml index 6f9765e66c676eb69ea77deffb27fb1cc360e930..c40f22ea5c4fc9a8da4f9f3ccbaad32fa4ffc6ad 100644 --- a/src/controls/PageStack.qml +++ b/src/controls/PageStack.qml @@ -485,7 +485,7 @@ Item { \endlist \sa push */ - property variant initialPage: null + property var initialPage: null /*! \readonly \a busy is \c true if a page transition is running, and \c false otherwise. */ diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 0416217bdb6bfe2be1c8b804923e874d90b04cfe..696b41dc03f693c63003e94a3a595d6adb76ebe0 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -112,7 +112,7 @@ ScrollView { \endcode \sa {qml-data-models}{Data Models} */ - property variant model + property var model /*! This property is set to \c true if the view alternates the row color. The default value is \c true. */ @@ -338,8 +338,8 @@ ScrollView { sourceComponent: root.rowDelegate property bool alternateBackground: (index + rowCount) % 2 === 1 property bool rowSelected: false - property variant model: listView.model - property variant modelData: null + property var model: listView.model + property var modelData: null } } } @@ -367,8 +367,8 @@ ScrollView { property int rowIndex: model.index property bool alternateBackground: alternatingRowColors && rowIndex % 2 == 1 - property variant itemModelData: typeof modelData == "undefined" ? null : modelData - property variant itemModel: model + property var itemModelData: typeof modelData == "undefined" ? null : modelData + property var itemModel: model Loader { id: rowstyle @@ -383,9 +383,9 @@ ScrollView { property bool alternateBackground: rowitem.alternateBackground property bool rowSelected: rowitem.ListView.isCurrentItem property int index: rowitem.rowIndex - property variant model: listView.model - property variant modelData: rowitem.itemModelData - property variant itemModel: rowitem.itemModel + property var model: listView.model + property var modelData: rowitem.itemModelData + property var itemModel: rowitem.itemModel } Row { id: row @@ -402,10 +402,10 @@ ScrollView { sourceComponent: columns[index].delegate ? columns[index].delegate : itemDelegate // these properties are exposed to the item delegate - property variant model: listView.model - property variant modelData: itemModelData + property var model: listView.model + property var modelData: itemModelData - property variant itemValue: __getValue() + property var itemValue: __getValue() property bool itemSelected: rowitem.ListView.isCurrentItem property color itemTextColor: itemSelected ? rowstyleitem.highlightedTextColor : rowstyleitem.textColor property int rowIndex: rowitem.rowIndex diff --git a/src/private/ScrollBar.qml b/src/private/ScrollBar.qml index 8c09d040cb183966751b2ff0b5649ce4d0ab60ed..3d4a5d1f9e27a39f82d9728a338014fa4fef7ef3 100644 --- a/src/private/ScrollBar.qml +++ b/src/private/ScrollBar.qml @@ -93,9 +93,9 @@ Item { onMouseXChanged: styleItem.activeControl = styleItem.hitTest(mouseX, mouseY) hoverEnabled: true - property variant control - property variant pressedX - property variant pressedY + property var control + property var pressedX + property var pressedY property int oldPosition property int grooveSize