From 7f847aef8e27d3870659ab6ec33428bc0e995396 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 18 Jun 2015 14:46:26 +0200 Subject: Add Frame::contentData & contentChildren Change-Id: I7ac0b334c23c5eb49229443f97a50491814321b4 Reviewed-by: J-P Nurmi --- src/imports/controls/ToolBar.qml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/imports/controls/ToolBar.qml') diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index e2bf8eac..f81ff916 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -40,8 +40,6 @@ import QtQuick.Controls 2.0 AbstractToolBar { id: control - default property alias data: content.data - implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) @@ -50,9 +48,7 @@ AbstractToolBar { Accessible.role: Accessible.ToolBar - contentItem: Item { - id: content - } + contentItem: Item { } background: Rectangle { implicitHeight: 26 -- cgit v1.2.3