diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 14:46:26 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 14:45:58 +0000 |
| commit | 7f847aef8e27d3870659ab6ec33428bc0e995396 (patch) | |
| tree | 066cd567b850f22de44afc66647a7fffcbd8ad00 /src/imports | |
| parent | f8e706403bc0d0c2ba2007f9edd01b60d9ef8dc6 (diff) | |
Add Frame::contentData & contentChildren
Change-Id: I7ac0b334c23c5eb49229443f97a50491814321b4
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/Frame.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/GroupBox.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/ToolBar.qml | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 9fad13dc..7580fb06 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -40,8 +40,6 @@ import QtQuick.Controls 2.0 AbstractFrame { 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 @@ AbstractFrame { padding: Theme.padding - contentItem: Item { - id: content - } + contentItem: Item { } frame: Rectangle { width: parent.width diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index a0af61da..c52af3ae 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -40,8 +40,6 @@ import QtQuick.Controls 2.0 AbstractGroupBox { 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) @@ -51,9 +49,7 @@ AbstractGroupBox { padding: Theme.padding topPadding: Theme.padding + (label && title ? label.implicitHeight + Theme.spacing : 0) - contentItem: Item { - id: content - } + contentItem: Item { } label: Text { x: control.leftPadding 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 |