QmlDesigner: Update properties in property editor

Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml

@@ -100,7 +100,7 @@ Section {
         }
 
         Label {
-            text: "State"
+            text: qsTr("State")
         }
         SecondColumnLayout {
             LineEdit {
@@ -158,5 +158,56 @@ Section {
             }
         }
 
+        Label {
+            text: qsTr("Focus")
+            tooltip: qsTr("Holds whether the item has focus within the enclosing FocusScope.")
+            disabledState: !backendValues.focus.isAvailable
+        }
+        SecondColumnLayout {
+            CheckBox {
+                backendValue: backendValues.focus
+                text: backendValues.focus.valueToString
+                enabled: backendValues.focus.isAvailable
+                implicitWidth: 180
+            }
+            ExpandingSpacer {
+            }
+        }
+
+        Label {
+            text: qsTr("Active focus on tab")
+            tooltip: qsTr("Holds whether the item wants to be in the tab focus chain.")
+            disabledState: !backendValues.activeFocusOnTab.isAvailable
+        }
+        SecondColumnLayout {
+            CheckBox {
+                backendValue: backendValues.activeFocusOnTab
+                text: backendValues.activeFocusOnTab.valueToString
+                enabled: backendValues.activeFocusOnTab.isAvailable
+                implicitWidth: 180
+            }
+            ExpandingSpacer {
+            }
+        }
+
+        Label {
+            text: qsTr("Baseline offset")
+            tooltip: qsTr("Specifies the position of the item's baseline in local coordinates.")
+            disabledState: !backendValues.baselineOffset.isAvailable
+        }
+        SecondColumnLayout {
+            SpinBox {
+                sliderIndicatorVisible: true
+                backendValue: backendValues.baselineOffset
+                hasSlider: true
+                decimals: 0
+                minimumValue: -1000
+                maximumValue: 1000
+                Layout.preferredWidth: 140
+                enabled: backendValues.baselineOffset.isAvailable
+            }
+            ExpandingSpacer {
+            }
+        }
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml

@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import HelperWidgets 2.0
+import QtQuick.Layouts 1.0
+
+Column {
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    ImageSpecifics {
+    }
+
+    Section {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        caption: qsTr("Animated Image")
+
+        SectionLayout {
+            Label {
+                text: qsTr("Speed")
+                disabledState: !backendValues.speed.isAvailable
+            }
+            SecondColumnLayout {
+                SpinBox {
+                    sliderIndicatorVisible: true
+                    backendValue: backendValues.speed
+                    hasSlider: true
+                    decimals: 2
+                    minimumValue: 0
+                    maximumValue: 100
+                    Layout.preferredWidth: 140
+                    enabled: backendValues.speed.isAvailable
+                }
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Paused")
+                tooltip: qsTr("Holds whether the animated image is paused.")
+                disabledState: !backendValues.paused.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.paused.isAvailable
+                    text: backendValues.paused.valueToString
+                    backendValue: backendValues.paused
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Playing")
+                tooltip: qsTr("Holds whether the animated image is playing.")
+                disabledState: !backendValues.playing.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.playing.isAvailable
+                    text: backendValues.playing.valueToString
+                    backendValue: backendValues.playing
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+        }
+    }
+}

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml

@@ -124,7 +124,7 @@ Column {
             }
 
             Label {
-                text: qsTr("Horizontal Fill mode")
+                text: qsTr("Horizontal Tile mode")
             }
 
             SecondColumnLayout {
@@ -138,7 +138,7 @@ Column {
             }
 
             Label {
-                text: qsTr("Vertical Fill mode")
+                text: qsTr("Vertical Tile mode")
             }
 
             SecondColumnLayout {
@@ -186,6 +186,70 @@ Column {
 
                 }
             }
+
+            Label {
+                text: qsTr("Mirror")
+                tooltip: qsTr("Specifies whether the image should be horizontally inverted.")
+                disabledState: !backendValues.mirror.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.mirror.isAvailable
+                    text: backendValues.mirror.valueToString
+                    backendValue: backendValues.mirror
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Smooth")
+                tooltip: qsTr("Specifies whether the image is smoothly filtered when scaled or transformed.")
+                disabledState: !backendValues.smooth.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.smooth.isAvailable
+                    text: backendValues.smooth.valueToString
+                    backendValue: backendValues.smooth
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Cache")
+                tooltip: qsTr("Specifies whether the image should be cached.")
+                disabledState: !backendValues.cache.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.cache.isAvailable
+                    text: backendValues.cache.valueToString
+                    backendValue: backendValues.cache
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Asynchronous")
+                tooltip: qsTr("Specifies that images on the local filesystem should be loaded asynchronously in a separate thread.")
+                disabledState: !backendValues.asynchronous.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.asynchronous.isAvailable
+                    text: backendValues.asynchronous.valueToString
+                    backendValue: backendValues.asynchronous
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
         }
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridSpecifics.qml

@@ -95,7 +95,32 @@ Column {
                     Layout.fillWidth: true
                     scope: "Qt"
                 }
+            }
 
+            Label {
+                text: qsTr("Horizontal item alignment")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    model: ["AlignLeft", "AlignRight" ,"AlignHCenter"]
+                    backendValue: backendValues.horizontalItemAlignment
+                    Layout.fillWidth: true
+                    scope: "Grid"
+                }
+            }
+
+            Label {
+                text: qsTr("Vertical item alignment")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    model: ["AlignTop", "AlignBottom" ,"AlignVCenter"]
+                    backendValue: backendValues.verticalItemAlignment
+                    Layout.fillWidth: true
+                    scope: "Grid"
+                }
             }
 
             Label {

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ImageSpecifics.qml

@@ -58,7 +58,7 @@ Column {
             SecondColumnLayout {
                 ComboBox {
                     scope: "Image"
-                    model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"]
+                    model: ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally", "Pad"]
                     backendValue: backendValues.fillMode
                     implicitWidth: 180
                     Layout.fillWidth: true
@@ -105,6 +105,136 @@ Column {
                 ExpandingSpacer {
                 }
             }
+
+            Label {
+                text: qsTr("Horizontal alignment")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    scope: "Image"
+                    model: ["AlignLeft", "AlignRight", "AlignHCenter"]
+                    backendValue: backendValues.horizontalAlignment
+                    implicitWidth: 180
+                    Layout.fillWidth: true
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Vertical alignment")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    scope: "Image"
+                    model: ["AlignTop", "AlignBottom", "AlignVCenter"]
+                    backendValue: backendValues.verticalAlignment
+                    implicitWidth: 180
+                    Layout.fillWidth: true
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Asynchronous")
+                tooltip: qsTr("Specifies that images on the local filesystem should be loaded asynchronously in a separate thread.")
+                disabledState: !backendValues.asynchronous.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.asynchronous.isAvailable
+                    text: backendValues.asynchronous.valueToString
+                    backendValue: backendValues.asynchronous
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Auto transform")
+                tooltip: qsTr("Specifies whether the image should automatically apply image transformation metadata such as EXIF orientation.")
+                disabledState: !backendValues.autoTransform.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.autoTransform.isAvailable
+                    text: backendValues.autoTransform.valueToString
+                    backendValue: backendValues.autoTransform
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Cache")
+                tooltip: qsTr("Specifies whether the image should be cached.")
+                disabledState: !backendValues.cache.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.cache.isAvailable
+                    text: backendValues.cache.valueToString
+                    backendValue: backendValues.cache
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Mipmap")
+                tooltip: qsTr("Specifies whether the image uses mipmap filtering when scaled or transformed.")
+                disabledState: !backendValues.mipmap.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.mipmap.isAvailable
+                    text: backendValues.mipmap.valueToString
+                    backendValue: backendValues.mipmap
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Mirror")
+                tooltip: qsTr("Specifies whether the image should be horizontally inverted.")
+                disabledState: !backendValues.mirror.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.mirror.isAvailable
+                    text: backendValues.mirror.valueToString
+                    backendValue: backendValues.mirror
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
+
+            Label {
+                text: qsTr("Smooth")
+                tooltip: qsTr("Specifies whether the image is smoothly filtered when scaled or transformed.")
+                disabledState: !backendValues.smooth.isAvailable
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    enabled: backendValues.smooth.isAvailable
+                    text: backendValues.smooth.valueToString
+                    backendValue: backendValues.smooth
+                    implicitWidth: 180
+                }
+                ExpandingSpacer {}
+            }
         }
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml

@@ -54,7 +54,7 @@ Column {
             }
 
             Label {
-                text: qsTr("Hover Enabled")
+                text: qsTr("Hover enabled")
                 tooltip: qsTr("This property holds whether hover events are handled.")
             }
 
@@ -68,6 +68,197 @@ Column {
                 ExpandingSpacer {
                 }
             }
+
+            Label {
+                text: qsTr("Accepted buttons")
+                tooltip: qsTr("This property holds the mouse buttons that the mouse area reacts to.")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    backendValue: backendValues.acceptedButtons
+                    model: ["LeftButton", "RightButton", "MiddleButton", "BackButton", "ForwardButton", "AllButtons"]
+                    Layout.fillWidth: true
+                    scope: "Qt"
+                }
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Press and hold interval")
+                tooltip: qsTr("This property overrides the elapsed time in milliseconds before pressAndHold is emitted.")
+            }
+
+            SecondColumnLayout {
+                SpinBox {
+                    backendValue: backendValues.pressAndHoldInterval
+                    minimumValue: 0
+                    maximumValue: 2000
+                    decimals: 0
+                }
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Scroll gesture enabled")
+                tooltip: qsTr("This property controls whether this MouseArea responds to scroll gestures from non-mouse devices.")
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    Layout.fillWidth: true
+                    backendValue: backendValues.scrollGestureEnabled
+                    text: backendValues.scrollGestureEnabled.valueToString
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Cursor shape")
+                tooltip: qsTr("This property holds the cursor shape for this mouse area.")
+            }
+
+            SecondColumnLayout {
+                ComboBox {
+                    backendValue: backendValues.cursorShape
+                    model: ["ArrowCursor", "UpArrowCursor", "CrossCursor", "WaitCursor",
+                            "IBeamCursor", "SizeVerCursor", "SizeHorCursor", "SizeBDiagCursor",
+                            "SizeFDiagCursor", "SizeAllCursor", "BlankCursor", "SplitVCursor",
+                            "SplitHCursor", "PointingHandCursor", "ForbiddenCursor", "WhatsThisCursor",
+                            "BusyCursor", "OpenHandCursor", "ClosedHandCursor", "DragCopyCursor",
+                            "DragMoveCursor", "DragLinkCursor"]
+                    Layout.fillWidth: true
+                    scope: "Qt"
+                }
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Prevent stealing")
+                tooltip: qsTr("This property controls whether the mouse events may be stolen from this MouseArea.")
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    Layout.fillWidth: true
+                    backendValue: backendValues.preventStealing
+                    text: backendValues.preventStealing.valueToString
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Propagate composed events")
+                tooltip: qsTr("This property controls whether composed mouse events will automatically propagate to other MouseAreas.")
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    Layout.fillWidth: true
+                    backendValue: backendValues.propagateComposedEvents
+                    text: backendValues.propagateComposedEvents.valueToString
+                }
+
+                ExpandingSpacer {
+                }
+            }
+        }
+    }
+
+    Section {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        caption: qsTr("Drag")
+
+        SectionLayout {
+            Label {
+                text: qsTr("Target")
+                tooltip: qsTr("Sets the id of the item to drag.")
+            }
+            SecondColumnLayout {
+                ItemFilterComboBox {
+                    typeFilter: "QtQuick.QtObject"
+                    validator: RegExpValidator { regExp: /(^$|^[a-z_]\w*)/ }
+                    backendValue: backendValues.drag_target
+                    Layout.fillWidth: true
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Axis")
+                tooltip: qsTr("Specifies whether dragging can be done horizontally, vertically, or both.")
+            }
+            SecondColumnLayout {
+                ComboBox {
+                    scope: "Drag"
+                    model: ["XAxis", "YAxis", "XAndYAxis"]
+                    backendValue: backendValues.drag_axis
+                    Layout.fillWidth: true
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Filter children")
+                tooltip: qsTr("Specifies whether a drag overrides descendant MouseAreas.")
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    Layout.fillWidth: true
+                    backendValue: backendValues.drag_filterChildren
+                    text: backendValues.drag_filterChildren.valueToString
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Threshold")
+                tooltip: qsTr("Determines the threshold in pixels of when the drag operation should start.")
+            }
+
+            SecondColumnLayout {
+                SpinBox {
+                    backendValue: backendValues.drag_threshold
+                    minimumValue: 0
+                    maximumValue: 5000
+                    decimals: 0
+                }
+
+                ExpandingSpacer {
+                }
+            }
+
+            Label {
+                text: qsTr("Smoothed")
+                tooltip: qsTr("If set to true, the target will be moved only after the drag operation has started.\n"
+                              + "If set to false, the target will be moved straight to the current mouse position.")
+            }
+
+            SecondColumnLayout {
+                CheckBox {
+                    Layout.fillWidth: true
+                    backendValue: backendValues.drag_smoothed
+                    text: backendValues.drag_smoothed.valueToString
+                }
+
+                ExpandingSpacer {
+                }
+            }
         }
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TextInputSection.qml

@@ -113,6 +113,19 @@ Section {
             minimumValue: -200
         }
 
+        Label {
+            visible: textInputSection.isTextInput
+            text: qsTr("Maximum length")
+            tooltip: qsTr("Sets the maximum permitted length of the text in the TextInput.")
+        }
+        SpinBox {
+            visible: textInputSection.isTextInput
+            Layout.fillWidth: true
+            backendValue: backendValues.maximumLength
+            minimumValue: 0
+            maximumValue: 32767
+        }
+
         Label {
             text: qsTr("Flags")
             Layout.alignment: Qt.AlignTop

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml

@@ -47,7 +47,7 @@ Section {
         SecondColumnLayout {
             ComboBox {
                 backendValue: backendValues.flickableDirection
-                model: ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
+                model: ["AutoFlickDirection", "AutoFlickIfNeeded", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"]
                 Layout.fillWidth: true
                 scope: "Flickable"
             }
@@ -63,7 +63,7 @@ Section {
         SecondColumnLayout {
             ComboBox {
                 backendValue: backendValues.boundsBehavior
-                model: ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"]
+                model: ["StopAtBounds", "DragOverBounds", "OvershootBounds", "DragAndOvershootBounds"]
                 Layout.fillWidth: true
                 scope: "Flickable"
             }
@@ -166,6 +166,23 @@ Section {
             }
         }
 
+        Label {
+            text: qsTr("Synchronous drag")
+            tooltip: qsTr("If set to true, then when the mouse or touchpoint moves far enough to begin dragging\n"
+                          + "the content, the content will jump, such that the content pixel which was under the\n"
+                          + "cursor or touchpoint when pressed remains under that point.")
+        }
+
+        SecondColumnLayout {
+            CheckBox {
+                Layout.fillWidth: true
+                backendValue: backendValues.synchronousDrag
+                text: backendValues.synchronousDrag.valueToString
+            }
+            ExpandingSpacer {
+            }
+        }
+
         Label {
             text: qsTr("Content size")
         }
@@ -246,6 +263,45 @@ Section {
             }
         }
 
+        Label {
+            text: qsTr("Origin")
+        }
+
+        SecondColumnLayout {
+            Label {
+                text: "X"
+                width: root.labelWidth
+            }
+
+            SpinBox {
+                backendValue: backendValues.originX
+                minimumValue: -8000
+                maximumValue: 8000
+                implicitWidth: root.spinBoxWidth
+                Layout.fillWidth: true
+            }
+
+            Item {
+                width: 4
+                height: 4
+            }
+
+            Label {
+                text: "Y"
+                width: root.labelWidth
+            }
+
+            SpinBox {
+                backendValue: backendValues.originY
+                minimumValue: -8000
+                maximumValue: 8000
+                implicitWidth: root.spinBoxWidth
+                Layout.fillWidth: true
+            }
+            ExpandingSpacer {
+            }
+        }
+
         Label {
             text: qsTr("Margins")
         }

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml

@@ -276,5 +276,17 @@ Section {
                               "Latin script,\n it is merely a cosmetic feature. Setting the preferShaping property to false will disable all such features\nwhen they are not required, which will improve performance in most cases.")
             }
         }
+
+        Label {
+            text: qsTr("Hinting preference")
+            toolTip: qsTr("Sets the preferred hinting on the text.")
+        }
+
+        ComboBox {
+            Layout.fillWidth: true
+            backendValue: getBackendValue("hintingPreference")
+            model: ["PreferDefaultHinting", "PreferNoHinting", "PreferVerticalHinting", "PreferFullHinting"]
+            scope: "Font"
+        }
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml

@@ -61,7 +61,7 @@ Section {
             Layout.fillWidth: true
             backendValue: backendValues.wrapMode
             scope: "Text"
-            model: ["NoWrap", "WordWrap", "WrapAnywhere", "WrapAtWordBoundaryOrAnywhere"]
+            model: ["NoWrap", "WordWrap", "WrapAnywhere", "Wrap"]
         }
 
         Label {
@@ -77,6 +77,21 @@ Section {
             model: ["ElideNone", "ElideLeft", "ElideMiddle", "ElideRight"]
         }
 
+        Label {
+            visible: showElide
+            text: qsTr("Maximum line count")
+            tooltip: qsTr("Limits the number of lines that the text item will show.")
+        }
+
+        SpinBox {
+            visible: showElide
+            Layout.fillWidth: true
+            backendValue: backendValues.maximumLineCount
+            minimumValue: 0
+            maximumValue: 10000
+            decimals: 0
+        }
+
         Label {
             text: qsTr("Alignment")
         }
@@ -124,6 +139,7 @@ Section {
             toolTip: qsTr("Specifies how the font size of the displayed text is determined.")
         }
         ComboBox {
+            id: fontSizeMode
             visible: showFontSizeMode
             scope: "Text"
             model:  ["FixedSize", "HorizontalFit", "VerticalFit", "Fit"]
@@ -131,6 +147,48 @@ Section {
             Layout.fillWidth: true
         }
 
+        Label {
+            visible: showFontSizeMode
+            text: qsTr("Minimum size")
+        }
+        SecondColumnLayout {
+            visible: showFontSizeMode
+
+            SpinBox {
+                enabled: fontSizeMode.currentIndex !== 0
+                minimumValue: 0
+                maximumValue: 500
+                decimals: 0
+                backendValue: backendValues.minimumPixelSize
+                Layout.fillWidth: true
+                Layout.minimumWidth: 60
+            }
+            Label {
+                text: qsTr("Pixel")
+                tooltip: qsTr("Specifies the minimum font pixel size of scaled text.")
+                width: 42
+            }
+
+            Item {
+                width: 4
+                height: 4
+            }
+
+            SpinBox {
+                enabled: fontSizeMode.currentIndex !== 0
+                minimumValue: 0
+                maximumValue: 500
+                decimals: 0
+                backendValue: backendValues.minimumPointSize
+                Layout.fillWidth: true
+                Layout.minimumWidth: 60
+            }
+            Label {
+                text: qsTr("Point")
+                tooltip: qsTr("Specifies the minimum font point size of scaled text.")
+                width: 42
+            }
+        }
 
         Label {
             visible: showLineHeight
@@ -148,5 +206,17 @@ Section {
             stepSize: 0.1
         }
 
+        Label {
+            visible: showLineHeight
+            text: qsTr("Line height mode")
+            toolTip: qsTr("Determines how the line height is specified.")
+        }
+        ComboBox {
+            visible: showLineHeight
+            scope: "Text"
+            model:  ["ProportionalHeight", "FixedHeight"]
+            backendValue: backendValues.lineHeightMode
+            Layout.fillWidth: true
+        }
     }
 }

src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

@@ -91,7 +91,12 @@ QStringList globalQtEnums()
         "Horizontal", "Vertical", "AlignVCenter", "AlignLeft", "LeftToRight", "RightToLeft",
         "AlignHCenter", "AlignRight", "AlignBottom", "AlignBaseline", "AlignTop", "BottomLeft",
         "LeftEdge", "RightEdge", "BottomEdge", "TopEdge", "TabFocus", "ClickFocus", "StrongFocus",
-        "WheelFocus", "NoFocus"
+        "WheelFocus", "NoFocus", "ArrowCursor", "UpArrowCursor", "CrossCursor", "WaitCursor",
+        "IBeamCursor", "SizeVerCursor", "SizeHorCursor", "SizeBDiagCursor", "SizeFDiagCursor",
+        "SizeAllCursor", "BlankCursor", "SplitVCursor", "SplitHCursor", "PointingHandCursor",
+        "ForbiddenCursor", "WhatsThisCursor", "BusyCursor", "OpenHandCursor", "ClosedHandCursor",
+        "DragCopyCursor", "DragMoveCursor", "DragLinkCursor", "TopToBottom",
+        "LeftButton", "RightButton", "MiddleButton", "BackButton", "ForwardButton", "AllButtons"
     };
 
     return list;
@@ -101,7 +106,7 @@ QStringList knownEnumScopes()
 {
     static const QStringList list = {
         "TextInput", "TextEdit", "Material", "Universal", "Font", "Shape", "ShapePath",
-        "AbstractButton", "Text", "ShaderEffectSource"
+        "AbstractButton", "Text", "ShaderEffectSource", "Grid"
     };
     return list;
 }