Merge "Merge remote-tracking branch 'origin/5.15' into dev"

17 files changed, 281 insertions, 13 deletions

diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml
index 7c53ac73..3446c08f 100644
--- a/src/imports/controls/designer/ControlSection.qml
+++ b/src/imports/controls/designer/ControlSection.qml
@@ -69,7 +69,7 @@ Section {
 
         Label {
             text: qsTr("Hover")
-            tooltip: qsTr("Whether control accepts hover evets.")
+            tooltip: qsTr("Whether control accepts hover events.")
         }
         SecondColumnLayout {
             CheckBox {
@@ -95,7 +95,7 @@ Section {
 
         Label {
             text: qsTr("Wheel")
-            tooltip: qsTr("Whether control accepts wheel evets.")
+            tooltip: qsTr("Whether control accepts wheel events.")
         }
         SecondColumnLayout {
             CheckBox {
diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml
index fc5b5e83..45f647f1 100644
--- a/src/imports/controls/designer/DialSpecifics.qml
+++ b/src/imports/controls/designer/DialSpecifics.qml
@@ -143,6 +143,18 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Wrap")
+                tooltip: qsTr("Whether the dial wraps when dragged.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.wrap.valueToString
+                    backendValue: backendValues.wrap
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
diff --git a/src/imports/controls/designer/InsetSection.qml b/src/imports/controls/designer/InsetSection.qml
new file mode 100644
index 00000000..4253b170
--- /dev/null
+++ b/src/imports/controls/designer/InsetSection.qml
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import HelperWidgets 2.0
+import QtQuick.Layouts 1.12
+
+Section {
+    caption: qsTr("Inset")
+
+    SectionLayout {
+        Label {
+            text: qsTr("Vertical")
+        }
+        SecondColumnLayout {
+            Label {
+                text: qsTr("Top")
+                tooltip: qsTr("Top inset for the background.")
+                width: 42
+            }
+            SpinBox {
+                maximumValue: 10000
+                minimumValue: -10000
+                realDragRange: 5000
+                decimals: 0
+                backendValue: backendValues.topInset
+                Layout.fillWidth: true
+            }
+            Item {
+                width: 4
+                height: 4
+            }
+
+            Label {
+                text: qsTr("Bottom")
+                tooltip: qsTr("Bottom inset for the background.")
+                width: 42
+            }
+            SpinBox {
+                maximumValue: 10000
+                minimumValue: -10000
+                realDragRange: 5000
+                decimals: 0
+                backendValue: backendValues.bottomInset
+                Layout.fillWidth: true
+            }
+        }
+
+        Label {
+            text: qsTr("Horizontal")
+        }
+        SecondColumnLayout {
+            Label {
+                text: qsTr("Left")
+                tooltip: qsTr("Left inset for the background.")
+                width: 42
+            }
+            SpinBox {
+                maximumValue: 10000
+                minimumValue: -10000
+                realDragRange: 5000
+                decimals: 0
+                backendValue: backendValues.leftInset
+                Layout.fillWidth: true
+            }
+            Item {
+                width: 4
+                height: 4
+            }
+
+            Label {
+                text: qsTr("Right")
+                tooltip: qsTr("Right inset for the background.")
+                width: 42
+            }
+            SpinBox {
+                maximumValue: 10000
+                minimumValue: -10000
+                realDragRange: 5000
+                decimals: 0
+                backendValue: backendValues.rightInset
+                Layout.fillWidth: true
+            }
+        }
+    }
+}
diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml
index c832f894..e5d5e04f 100644
--- a/src/imports/controls/designer/LabelSpecifics.qml
+++ b/src/imports/controls/designer/LabelSpecifics.qml
@@ -79,4 +79,8 @@ Column {
     PaddingSection {
         width: parent.width
     }
+
+    InsetSection {
+        width: parent.width
+    }
 }
diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml
index 042672a9..20aa8577 100644
--- a/src/imports/controls/designer/PageIndicatorSpecifics.qml
+++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml
@@ -73,6 +73,18 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Interactive")
+                tooltip: qsTr("Whether the control is interactive.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.interactive.valueToString
+                    backendValue: backendValues.interactive
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
@@ -80,10 +92,6 @@ Column {
         width: parent.width
     }
 
-    FontSection {
-        width: parent.width
-    }
-
     PaddingSection {
         width: parent.width
     }
diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/imports/controls/designer/RangeSliderSpecifics.qml
index 79d2404f..2324a66f 100644
--- a/src/imports/controls/designer/RangeSliderSpecifics.qml
+++ b/src/imports/controls/designer/RangeSliderSpecifics.qml
@@ -158,6 +158,20 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Touch drag threshold")
+                tooltip: qsTr("The threshold (in logical pixels) at which a touch drag event will be initiated.")
+            }
+            SecondColumnLayout {
+                SpinBox {
+                    minimumValue: 0
+                    maximumValue: 10000
+                    decimals: 0
+                    backendValue: backendValues.touchDragThreshold
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/imports/controls/designer/RoundButtonSpecifics.qml
index 2da4cda6..af4ab5d0 100644
--- a/src/imports/controls/designer/RoundButtonSpecifics.qml
+++ b/src/imports/controls/designer/RoundButtonSpecifics.qml
@@ -42,6 +42,7 @@ Column {
     width: parent.width
 
     Section {
+        width: parent.width
         caption: qsTr("RoundButton")
 
         SectionLayout {
@@ -51,8 +52,8 @@ Column {
             }
             SecondColumnLayout {
                 SpinBox {
-                    maximumValue: 9999999
-                    minimumValue: -9999999
+                    minimumValue: 0
+                    maximumValue: 10000
                     decimals: 0
                     backendValue: backendValues.radius
                     Layout.fillWidth: true
diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml
index 076d8a1c..d126dd06 100644
--- a/src/imports/controls/designer/SliderSpecifics.qml
+++ b/src/imports/controls/designer/SliderSpecifics.qml
@@ -143,6 +143,20 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Touch drag threshold")
+                tooltip: qsTr("The threshold (in logical pixels) at which a touch drag event will be initiated.")
+            }
+            SecondColumnLayout {
+                SpinBox {
+                    minimumValue: 0
+                    maximumValue: 10000
+                    decimals: 0
+                    backendValue: backendValues.touchDragThreshold
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/imports/controls/designer/SpinBoxSpecifics.qml
index d6375d7c..db59f074 100644
--- a/src/imports/controls/designer/SpinBoxSpecifics.qml
+++ b/src/imports/controls/designer/SpinBoxSpecifics.qml
@@ -113,6 +113,18 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+
+            Label {
+                text: qsTr("Wrap")
+                tooltip: qsTr("Whether the spinbox wraps.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.wrap.valueToString
+                    backendValue: backendValues.wrap
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml
index a14584e7..f8cf92e8 100644
--- a/src/imports/controls/designer/TextAreaSpecifics.qml
+++ b/src/imports/controls/designer/TextAreaSpecifics.qml
@@ -57,6 +57,29 @@ Column {
                 }
 
             }
+
+            Label {
+                text: qsTr("Hover")
+                tooltip: qsTr("Whether text area accepts hover events.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.hoverEnabled.valueToString
+                    backendValue: backendValues.hoverEnabled
+                    Layout.fillWidth: true
+                }
+            }
+        }
+    }
+
+    Section {
+        width: parent.width
+        caption: qsTr("Placeholder Text Color")
+
+        ColorEditor {
+            caption: qsTr("Placeholder Text Color")
+            backendValue: backendValues.placeholderTextColor
+            supportGradient: false
         }
     }
 
@@ -74,4 +97,8 @@ Column {
     PaddingSection {
         width: parent.width
     }
+
+    InsetSection {
+        width: parent.width
+    }
 }
diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml
index 67a63ec4..f95f282c 100644
--- a/src/imports/controls/designer/TextFieldSpecifics.qml
+++ b/src/imports/controls/designer/TextFieldSpecifics.qml
@@ -57,6 +57,29 @@ Column {
                 }
 
             }
+
+            Label {
+                text: qsTr("Hover")
+                tooltip: qsTr("Whether text field accepts hover events.")
+            }
+            SecondColumnLayout {
+                CheckBox {
+                    text: backendValues.hoverEnabled.valueToString
+                    backendValue: backendValues.hoverEnabled
+                    Layout.fillWidth: true
+                }
+            }
+        }
+    }
+
+    Section {
+        width: parent.width
+        caption: qsTr("Placeholder Text Color")
+
+        ColorEditor {
+            caption: qsTr("Placeholder Text Color")
+            backendValue: backendValues.placeholderTextColor
+            supportGradient: false
         }
     }
 
@@ -71,4 +94,8 @@ Column {
     PaddingSection {
         width: parent.width
     }
+
+    InsetSection {
+        width: parent.width
+    }
 }
diff --git a/src/imports/controls/designer/designer.pri b/src/imports/controls/designer/designer.pri
index 3ad99df7..6692b203 100644
--- a/src/imports/controls/designer/designer.pri
+++ b/src/imports/controls/designer/designer.pri
@@ -17,6 +17,7 @@ AUX_QML_FILES += \
     $$PWD/DialSpecifics.qml \
     $$PWD/FrameSpecifics.qml \
     $$PWD/GroupBoxSpecifics.qml \
+    $$PWD/InsetSection.qml \
     $$PWD/ItemDelegateSection.qml \
     $$PWD/ItemDelegateSpecifics.qml \
     $$PWD/LabelSpecifics.qml \
diff --git a/src/imports/controls/fusion/plugins.qmltypes b/src/imports/controls/fusion/plugins.qmltypes
index 5140d1e8..681b8b90 100644
--- a/src/imports/controls/fusion/plugins.qmltypes
+++ b/src/imports/controls/fusion/plugins.qmltypes
@@ -4,7 +4,7 @@ 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.Fusion 2.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Fusion 2.15'
 
 Module {
     dependencies: ["QtQuick.Controls 2.0"]
diff --git a/src/imports/controls/imagine/plugins.qmltypes b/src/imports/controls/imagine/plugins.qmltypes
index 191807ae..785b6dba 100644
--- a/src/imports/controls/imagine/plugins.qmltypes
+++ b/src/imports/controls/imagine/plugins.qmltypes
@@ -4,7 +4,7 @@ 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.Imagine 2.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Imagine 2.15'
 
 Module {
     dependencies: ["QtQuick.Controls 2.0"]
@@ -54,6 +54,7 @@ Module {
         Property { name: "verticalAlignment"; type: "VAlignment" }
         Property { name: "mipmap"; revision: 3; type: "bool" }
         Property { name: "autoTransform"; revision: 5; type: "bool" }
+        Property { name: "sourceClipRect"; revision: 15; type: "QRectF" }
         Signal { name: "paintedGeometryChanged" }
         Signal {
             name: "horizontalAlignmentChanged"
@@ -75,6 +76,14 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
         Enum {
+            name: "LoadPixmapOptions"
+            values: {
+                "NoOption": 0,
+                "HandleDPR": 1,
+                "UseProviderOptions": 2
+            }
+        }
+        Enum {
             name: "Status"
             values: {
                 "Null": 0,
@@ -92,6 +101,7 @@ Module {
         Property { name: "mirror"; type: "bool" }
         Property { name: "currentFrame"; revision: 14; type: "int" }
         Property { name: "frameCount"; revision: 14; type: "int"; isReadonly: true }
+        Property { name: "colorSpace"; revision: 15; type: "QColorSpace" }
         Signal {
             name: "sourceChanged"
             Parameter { type: "QUrl" }
@@ -106,6 +116,8 @@ Module {
         }
         Signal { name: "currentFrameChanged"; revision: 14 }
         Signal { name: "frameCountChanged"; revision: 14 }
+        Signal { name: "sourceClipRectChanged"; revision: 15 }
+        Signal { name: "colorSpaceChanged"; revision: 15 }
     }
     Component {
         name: "QQuickImageSelector"
diff --git a/src/imports/controls/material/plugins.qmltypes b/src/imports/controls/material/plugins.qmltypes
index 7546a7b0..e290e0ea 100644
--- a/src/imports/controls/material/plugins.qmltypes
+++ b/src/imports/controls/material/plugins.qmltypes
@@ -4,7 +4,7 @@ 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.Material 2.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Material 2.15'
 
 Module {
     dependencies: ["QtQuick.Controls 2.0"]
@@ -328,6 +328,7 @@ Module {
         Property { name: "toolBarColor"; type: "QColor"; isReadonly: true }
         Property { name: "toolTextColor"; type: "QColor"; isReadonly: true }
         Property { name: "spinBoxDisabledIconColor"; type: "QColor"; isReadonly: true }
+        Property { name: "sliderDisabledColor"; revision: 15; type: "QColor"; isReadonly: true }
         Property { name: "touchTarget"; type: "int"; isReadonly: true }
         Property { name: "buttonHeight"; type: "int"; isReadonly: true }
         Property { name: "delegateHeight"; type: "int"; isReadonly: true }
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index c3e53431..e8212c55 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -4,7 +4,7 @@ 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 2.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls 2.15'
 
 Module {
     dependencies: [
@@ -589,6 +589,14 @@ Module {
         defaultProperty: "contentData"
     }
     Component {
+        prototype: "QQuickHorizontalHeaderView"
+        name: "QtQuick.Controls/HorizontalHeaderView 2.15"
+        exports: ["QtQuick.Controls/HorizontalHeaderView 2.15"]
+        exportMetaObjectRevisions: [15]
+        isComposite: true
+        defaultProperty: "flickableData"
+    }
+    Component {
         prototype: "QQuickItemDelegate"
         name: "QtQuick.Controls/ItemDelegate 2.0"
         exports: ["QtQuick.Controls/ItemDelegate 2.0"]
@@ -876,4 +884,12 @@ Module {
         isComposite: true
         defaultProperty: "data"
     }
+    Component {
+        prototype: "QQuickVerticalHeaderView"
+        name: "QtQuick.Controls/VerticalHeaderView 2.15"
+        exports: ["QtQuick.Controls/VerticalHeaderView 2.15"]
+        exportMetaObjectRevisions: [15]
+        isComposite: true
+        defaultProperty: "flickableData"
+    }
 }
diff --git a/src/imports/controls/universal/plugins.qmltypes b/src/imports/controls/universal/plugins.qmltypes
index 1734c01b..c38e39e1 100644
--- a/src/imports/controls/universal/plugins.qmltypes
+++ b/src/imports/controls/universal/plugins.qmltypes
@@ -4,7 +4,7 @@ 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.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Universal 2.15'
 
 Module {
     dependencies: ["QtQuick.Controls 2.0"]