aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/TabBar.qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/universal/TabBar.qml')
-rw-r--r--src/imports/controls/universal/TabBar.qml17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml
index 1eee3b06..7c2e83a6 100644
--- a/src/imports/controls/universal/TabBar.qml
+++ b/src/imports/controls/universal/TabBar.qml
@@ -1,9 +1,9 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
-** This file is part of the Qt Labs Controls module of the Qt Toolkit.
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
@@ -34,9 +34,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import Qt.labs.templates 1.0 as T
-import Qt.labs.controls.universal 1.0
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
+import QtQuick.Controls.Universal 2.0
T.TabBar {
id: control
@@ -46,7 +46,6 @@ T.TabBar {
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding)
- //! [contentItem]
contentItem: PathView {
implicitWidth: 200
implicitHeight: 48
@@ -56,6 +55,7 @@ T.TabBar {
interactive: false
snapMode: PathView.SnapToItem
+ movementDirection: PathView.Positive
highlightMoveDuration: 100
path: Path {
@@ -67,13 +67,10 @@ T.TabBar {
}
}
}
- //! [contentItem]
- //! [background]
background: Rectangle {
implicitWidth: 200
implicitHeight: 48
- color: control.Universal.altHighColor
+ color: control.Universal.background
}
- //! [background]
}