aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/Frame.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 14:46:26 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 14:45:58 +0000
commit7f847aef8e27d3870659ab6ec33428bc0e995396 (patch)
tree066cd567b850f22de44afc66647a7fffcbd8ad00 /src/imports/controls/Frame.qml
parentf8e706403bc0d0c2ba2007f9edd01b60d9ef8dc6 (diff)
Add Frame::contentData & contentChildren
Change-Id: I7ac0b334c23c5eb49229443f97a50491814321b4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Frame.qml')
-rw-r--r--src/imports/controls/Frame.qml6
1 files changed, 1 insertions, 5 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