1 files changed, 10 insertions, 13 deletions
diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml
index ab660c93..c7d27cbd 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/imports/controls/universal/TabBar.qml
@@ -46,23 +46,20 @@ T.TabBar {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              contentHeight + topPadding + bottomPadding)
 
-    contentItem: PathView {
+    contentItem: ListView {
         model: control.contentModel
         currentIndex: control.currentIndex
 
-        interactive: false
-        snapMode: PathView.SnapToItem
-        movementDirection: PathView.Positive
-        highlightMoveDuration: 100
+        spacing: control.spacing
+        orientation: ListView.Horizontal
+        boundsBehavior: Flickable.StopAtBounds
+        flickableDirection: Flickable.AutoFlickIfNeeded
+        snapMode: ListView.SnapToItem
 
-        path: Path {
-            startX: control.count ? control.availableWidth / control.count / 2 : 0
-            startY: control.availableHeight / 2
-            PathLine {
-                x: control.count ? control.availableWidth + (control.availableWidth / control.count / 2) : 0
-                y: control.availableHeight / 2
-            }
-        }
+        highlightMoveDuration: 100
+        highlightRangeMode: ListView.ApplyRange
+        preferredHighlightBegin: 48
+        preferredHighlightEnd: width - 48
     }
 
     background: Rectangle {