diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
commit | 5169a1ecd03eaea95ab07aeefc8d76cca7530563 (patch) | |
tree | 2666aecdf5a9c90d9b68dd7df8c6b5d1507541a6 /src/imports/controls/Drawer.qml | |
parent | 7decf1ee51df6c772b84ba8bed2f1e3d0e344908 (diff) | |
parent | 814601e9cdf5895152cedcd1968fd2a4eecd3cd3 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/Drawer.qml
src/imports/controls/Frame.qml
src/imports/controls/GroupBox.qml
src/imports/controls/Page.qml
src/imports/controls/Pane.qml
src/imports/controls/ToolBar.qml
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickpopup.cpp
tests/auto/accessibility/data/busyindicator.qml
tests/auto/accessibility/data/button.qml
tests/auto/accessibility/data/checkbox.qml
tests/auto/accessibility/data/control.qml
tests/auto/accessibility/data/dial.qml
tests/auto/accessibility/data/label.qml
tests/auto/accessibility/data/menu.qml
tests/auto/accessibility/data/pageindicator.qml
tests/auto/accessibility/data/popup.qml
tests/auto/accessibility/data/progressbar.qml
tests/auto/accessibility/data/radiobutton.qml
tests/auto/accessibility/data/rangeslider.qml
tests/auto/accessibility/data/scrollbar.qml
tests/auto/accessibility/data/scrollindicator.qml
tests/auto/accessibility/data/slider.qml
tests/auto/accessibility/data/spinbox.qml
tests/auto/accessibility/data/switch.qml
tests/auto/accessibility/data/tabbar.qml
tests/auto/accessibility/data/tabbutton.qml
tests/auto/accessibility/data/textarea.qml
tests/auto/accessibility/data/textfield.qml
tests/auto/accessibility/data/toolbar.qml
tests/auto/accessibility/data/toolbutton.qml
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
Diffstat (limited to 'src/imports/controls/Drawer.qml')
-rw-r--r-- | src/imports/controls/Drawer.qml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 90fef012..a90893d9 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -55,15 +55,9 @@ T.Drawer { rightPadding: control.edge === Qt.LeftEdge bottomPadding: control.edge === Qt.TopEdge - //! [enter] enter: Transition { SmoothedAnimation { velocity: 5 } } - //! [enter] - - //! [exit] exit: Transition { SmoothedAnimation { velocity: 5 } } - //! [exit] - //! [background] background: Rectangle { Rectangle { readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge @@ -74,5 +68,4 @@ T.Drawer { y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 } } - //! [background] } |