diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-22 08:44:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-22 08:55:29 +0200 |
| commit | ab91c57135f7a86437a5a4341cd32df1d4682480 (patch) | |
| tree | 713612fe2c27ff43ab4a3d5ed3b363c6141d5fbf /src/imports/controls/Drawer.qml | |
| parent | c5a44092c8b73c540862c4a160c31487a8518992 (diff) | |
| parent | 7193318330bc518255fb7ed008c144578f49b4bd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716
Diffstat (limited to 'src/imports/controls/Drawer.qml')
| -rw-r--r-- | src/imports/controls/Drawer.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 4b4ea8c0..eca9b949 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -42,6 +42,8 @@ import QtQuick.Templates 2.1 as T T.Drawer { id: control + parent: T.ApplicationWindow.overlay + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) |