diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 18:20:15 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 19:20:42 +0100 |
| commit | 6c88fe58a6037d252f40bf00aa5052b0f724a862 (patch) | |
| tree | 9afdf0b638bc89e5e71eeac7b3c06ed53831e45b /src/imports/controls/SwipeView.qml | |
| parent | 83cbe4e899d2d22e923bdc10e90f91ef106edf58 (diff) | |
| parent | 3f646aca34c25f7cc36df2f988790bb238026422 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/BusyIndicator.qml
src/imports/controls/ProgressBar.qml
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickstackview.cpp
Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
Diffstat (limited to 'src/imports/controls/SwipeView.qml')
| -rw-r--r-- | src/imports/controls/SwipeView.qml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index cd026f7c..555775ee 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -46,9 +46,6 @@ T.SwipeView { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - Accessible.role: Accessible.PageTabList - - //! [contentItem] contentItem: ListView { model: control.contentModel interactive: control.interactive @@ -64,5 +61,4 @@ T.SwipeView { preferredHighlightEnd: 0 highlightMoveDuration: 250 } - //! [contentItem] } |