diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:16:24 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:16:24 +0100 |
| commit | 80a5e0fffcf5c064ac4fea1ed8dc7e0a390a2d45 (patch) | |
| tree | d3f8c8a8c43d43b312fb60189bbea4dd71f70179 /src/controls/ApplicationWindow.qml | |
| parent | 10e5b4fff66c56ee8ac77db9ab4d4df5e9e7bd62 (diff) | |
| parent | 69b567b66ef9e90bb3c2179bded54961d3051039 (diff) | |
| download | qtquickcontrols-80a5e0fffcf5c064ac4fea1ed8dc7e0a390a2d45.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I678a00ebdf769eaa87d43214c2a32c303d3877ca
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 43bc9889..564e8d2a 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -145,7 +145,8 @@ Window { anchors.top: parent.top anchors.left: parent.left anchors.right: parent.right - height: childrenRect.height + implicitHeight: childrenRect.height + height: visibleChildren.length > 0 ? implicitHeight: 0 } Item { @@ -153,7 +154,8 @@ Window { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right - height: childrenRect.height + implicitHeight: childrenRect.height + height: visibleChildren.length > 0 ? implicitHeight: 0 } onVisibleChanged: if (visible && menuBar) menuBar.__parentWindow = root |