Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I61919fabd4a3a07ed374f2c3c1fae2d589d6e124

19 files changed, 212 insertions, 15 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 {
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index cf7325b6..431cdf7c 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -59,7 +59,7 @@ T.ToolTip {
     contentItem: Text {
         text: control.text
         font: control.font
-        // TODO: wrapMode: Label.Wrap
+        wrapMode: Text.Wrap
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground
     }
diff --git a/src/imports/controls/universal/images/checkmark.png b/src/imports/controls/universal/images/checkmark.png
index 4397f3b4..e2aae6fe 100644
--- a/src/imports/controls/universal/images/checkmark.png
+++ b/src/imports/controls/universal/images/checkmark.png
diff --git a/src/imports/controls/universal/images/checkmark@2x.png b/src/imports/controls/universal/images/checkmark@2x.png
index 1e3a41fc..0df4159a 100644
--- a/src/imports/controls/universal/images/checkmark@2x.png
+++ b/src/imports/controls/universal/images/checkmark@2x.png
diff --git a/src/imports/controls/universal/images/checkmark@3x.png b/src/imports/controls/universal/images/checkmark@3x.png
index d69ebb2e..43466cbc 100644
--- a/src/imports/controls/universal/images/checkmark@3x.png
+++ b/src/imports/controls/universal/images/checkmark@3x.png
diff --git a/src/imports/controls/universal/images/checkmark@4x.png b/src/imports/controls/universal/images/checkmark@4x.png
index 0837c6a5..7a47bd21 100644
--- a/src/imports/controls/universal/images/checkmark@4x.png
+++ b/src/imports/controls/universal/images/checkmark@4x.png
diff --git a/src/imports/controls/universal/images/downarrow.png b/src/imports/controls/universal/images/downarrow.png
index 9ac84a23..b66e2efc 100644
--- a/src/imports/controls/universal/images/downarrow.png
+++ b/src/imports/controls/universal/images/downarrow.png
diff --git a/src/imports/controls/universal/images/downarrow@2x.png b/src/imports/controls/universal/images/downarrow@2x.png
index 8dafab94..a704376c 100644
--- a/src/imports/controls/universal/images/downarrow@2x.png
+++ b/src/imports/controls/universal/images/downarrow@2x.png
diff --git a/src/imports/controls/universal/images/downarrow@3x.png b/src/imports/controls/universal/images/downarrow@3x.png
index 17ab1cf8..3b6d55ab 100644
--- a/src/imports/controls/universal/images/downarrow@3x.png
+++ b/src/imports/controls/universal/images/downarrow@3x.png
diff --git a/src/imports/controls/universal/images/downarrow@4x.png b/src/imports/controls/universal/images/downarrow@4x.png
index 0e145e2d..818c6b24 100644
--- a/src/imports/controls/universal/images/downarrow@4x.png
+++ b/src/imports/controls/universal/images/downarrow@4x.png
diff --git a/src/imports/controls/universal/images/leftarrow.png b/src/imports/controls/universal/images/leftarrow.png
index 2646aafc..0153ccd4 100644
--- a/src/imports/controls/universal/images/leftarrow.png
+++ b/src/imports/controls/universal/images/leftarrow.png
diff --git a/src/imports/controls/universal/images/leftarrow@2x.png b/src/imports/controls/universal/images/leftarrow@2x.png
index 500396f7..fa692d5b 100644
--- a/src/imports/controls/universal/images/leftarrow@2x.png
+++ b/src/imports/controls/universal/images/leftarrow@2x.png
diff --git a/src/imports/controls/universal/images/leftarrow@3x.png b/src/imports/controls/universal/images/leftarrow@3x.png
index 7ae2cafd..06b0207a 100644
--- a/src/imports/controls/universal/images/leftarrow@3x.png
+++ b/src/imports/controls/universal/images/leftarrow@3x.png
diff --git a/src/imports/controls/universal/images/leftarrow@4x.png b/src/imports/controls/universal/images/leftarrow@4x.png
index ade9df95..1049f616 100644
--- a/src/imports/controls/universal/images/leftarrow@4x.png
+++ b/src/imports/controls/universal/images/leftarrow@4x.png
diff --git a/src/imports/controls/universal/images/rightarrow.png b/src/imports/controls/universal/images/rightarrow.png
index 2e730d46..b24d117d 100644
--- a/src/imports/controls/universal/images/rightarrow.png
+++ b/src/imports/controls/universal/images/rightarrow.png
diff --git a/src/imports/controls/universal/images/rightarrow@2x.png b/src/imports/controls/universal/images/rightarrow@2x.png
index a089d030..80aca7c1 100644
--- a/src/imports/controls/universal/images/rightarrow@2x.png
+++ b/src/imports/controls/universal/images/rightarrow@2x.png
diff --git a/src/imports/controls/universal/images/rightarrow@3x.png b/src/imports/controls/universal/images/rightarrow@3x.png
index 2e8921a9..ba017240 100644
--- a/src/imports/controls/universal/images/rightarrow@3x.png
+++ b/src/imports/controls/universal/images/rightarrow@3x.png
diff --git a/src/imports/controls/universal/images/rightarrow@4x.png b/src/imports/controls/universal/images/rightarrow@4x.png
index 9ecb8e88..21f7ed4d 100644
--- a/src/imports/controls/universal/images/rightarrow@4x.png
+++ b/src/imports/controls/universal/images/rightarrow@4x.png
diff --git a/src/imports/controls/universal/plugins.qmltypes b/src/imports/controls/universal/plugins.qmltypes
index c80ff1d4..1734c01b 100644
--- a/src/imports/controls/universal/plugins.qmltypes
+++ b/src/imports/controls/universal/plugins.qmltypes
@@ -4,12 +4,212 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Universal 2.13'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Universal 2.14'
 
 Module {
     dependencies: ["QtQuick.Controls 2.0"]
     Component { name: "QQuickAttachedObject"; prototype: "QObject" }
     Component {
+        name: "QQuickItem"
+        defaultProperty: "data"
+        prototype: "QObject"
+        Enum {
+            name: "Flags"
+            values: {
+                "ItemClipsChildrenToShape": 1,
+                "ItemAcceptsInputMethod": 2,
+                "ItemIsFocusScope": 4,
+                "ItemHasContents": 8,
+                "ItemAcceptsDrops": 16
+            }
+        }
+        Enum {
+            name: "TransformOrigin"
+            values: {
+                "TopLeft": 0,
+                "Top": 1,
+                "TopRight": 2,
+                "Left": 3,
+                "Center": 4,
+                "Right": 5,
+                "BottomLeft": 6,
+                "Bottom": 7,
+                "BottomRight": 8
+            }
+        }
+        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "x"; type: "double" }
+        Property { name: "y"; type: "double" }
+        Property { name: "z"; type: "double" }
+        Property { name: "width"; type: "double" }
+        Property { name: "height"; type: "double" }
+        Property { name: "opacity"; type: "double" }
+        Property { name: "enabled"; type: "bool" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+        Property { name: "state"; type: "string" }
+        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+        Property { name: "baselineOffset"; type: "double" }
+        Property { name: "clip"; type: "bool" }
+        Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+        Property { name: "rotation"; type: "double" }
+        Property { name: "scale"; type: "double" }
+        Property { name: "transformOrigin"; type: "TransformOrigin" }
+        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+        Property { name: "smooth"; type: "bool" }
+        Property { name: "antialiasing"; type: "bool" }
+        Property { name: "implicitWidth"; type: "double" }
+        Property { name: "implicitHeight"; type: "double" }
+        Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true }
+        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+        Signal {
+            name: "childrenRectChanged"
+            Parameter { type: "QRectF" }
+        }
+        Signal {
+            name: "baselineOffsetChanged"
+            Parameter { type: "double" }
+        }
+        Signal {
+            name: "stateChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
+            name: "focusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "activeFocusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "activeFocusOnTabChanged"
+            revision: 1
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "parentChanged"
+            Parameter { type: "QQuickItem"; isPointer: true }
+        }
+        Signal {
+            name: "transformOriginChanged"
+            Parameter { type: "TransformOrigin" }
+        }
+        Signal {
+            name: "smoothChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "antialiasingChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "clipChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "windowChanged"
+            revision: 1
+            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+        }
+        Signal { name: "containmentMaskChanged"; revision: 11 }
+        Method { name: "update" }
+        Method {
+            name: "grabToImage"
+            revision: 4
+            type: "bool"
+            Parameter { name: "callback"; type: "QJSValue" }
+            Parameter { name: "targetSize"; type: "QSize" }
+        }
+        Method {
+            name: "grabToImage"
+            revision: 4
+            type: "bool"
+            Parameter { name: "callback"; type: "QJSValue" }
+        }
+        Method {
+            name: "contains"
+            type: "bool"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
+            name: "mapFromItem"
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "mapToItem"
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "mapFromGlobal"
+            revision: 7
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "mapToGlobal"
+            revision: 7
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method { name: "forceActiveFocus" }
+        Method {
+            name: "forceActiveFocus"
+            Parameter { name: "reason"; type: "Qt::FocusReason" }
+        }
+        Method {
+            name: "nextItemInFocusChain"
+            revision: 1
+            type: "QQuickItem*"
+            Parameter { name: "forward"; type: "bool" }
+        }
+        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+        Method {
+            name: "childAt"
+            type: "QQuickItem*"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+    }
+    Component {
+        name: "QQuickPaintedItem"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Enum {
+            name: "RenderTarget"
+            values: {
+                "Image": 0,
+                "FramebufferObject": 1,
+                "InvertedYFramebufferObject": 2
+            }
+        }
+        Enum {
+            name: "PerformanceHints"
+            values: {
+                "FastFBOResizing": 1
+            }
+        }
+        Property { name: "contentsSize"; type: "QSize" }
+        Property { name: "fillColor"; type: "QColor" }
+        Property { name: "contentsScale"; type: "double" }
+        Property { name: "renderTarget"; type: "RenderTarget" }
+        Property { name: "textureSize"; type: "QSize" }
+    }
+    Component {
         name: "QQuickUniversalBusyIndicator"
         defaultProperty: "data"
         prototype: "QQuickItem"