diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-11 10:24:46 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-11 10:24:46 +0000 |
commit | 7b33addb8d8d1c07dda9a9f39d86f7bda812da82 (patch) | |
tree | 01888baa4cf5c8737d3456466deff895ea97bea7 /src/imports/controls/Page.qml | |
parent | f5467114b789dcb33ad88105fe84bddf42436d8c (diff) | |
parent | 6c88fe58a6037d252f40bf00aa5052b0f724a862 (diff) |
Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/dev
Diffstat (limited to 'src/imports/controls/Page.qml')
-rw-r--r-- | src/imports/controls/Page.qml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index edd8d628..02f81e07 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -54,9 +54,7 @@ T.Page { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - //! [background] background: Rectangle { color: Default.backgroundColor } - //! [background] } |