diff --git a/src/controls/Action.qml b/src/controls/Action.qml --- a/src/controls/Action.qml +++ b/src/controls/Action.qml @@ -84,7 +84,7 @@ */ property bool expandible: false - property QtObject parent + property Controls.Action parent default property alias children: root.__children property list __children diff --git a/src/controls/private/ActionsMenu.qml b/src/controls/private/ActionsMenu.qml --- a/src/controls/private/ActionsMenu.qml +++ b/src/controls/private/ActionsMenu.qml @@ -18,7 +18,7 @@ */ import QtQuick 2.3 -import QtQuick.Controls 2.2 as Controls +import QtQuick.Controls 2.4 as Controls import org.kde.kirigami 2.4 as Kirigami Controls.Menu @@ -30,7 +30,7 @@ //renamed to work on both Qt 5.9 and 5.10 property Component itemDelegate: ActionMenuItem {} property Component separatorDelegate: Controls.MenuSeparator { } - property QtObject parentAction + property Controls.Action parentAction property Controls.MenuItem parentItem Item { @@ -42,7 +42,7 @@ active: theMenu.visible delegate: QtObject { - readonly property QtObject action: modelData + readonly property Controls.Action action: modelData property QtObject item: null function create() { diff --git a/src/controls/private/PrivateActionToolButton.qml b/src/controls/private/PrivateActionToolButton.qml --- a/src/controls/private/PrivateActionToolButton.qml +++ b/src/controls/private/PrivateActionToolButton.qml @@ -19,7 +19,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.2 as Controls +import QtQuick.Controls 2.4 as Controls import org.kde.kirigami 2.4 Controls.ToolButton { @@ -41,7 +41,7 @@ flat: !control.kirigamiAction || !control.kirigamiAction.icon.color.a //TODO: replace with upstream action when we depend on Qt 5.10 //TODO: upstream action makes the style to re-draw the content, it'd be ideal except for the custom dropDown icon needed for actionsMenu - property QtObject kirigamiAction + property Controls.Action kirigamiAction property bool showText: true property bool showMenuArrow: true property alias menu: menu