aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-06-05 18:05:52 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-06-06 12:57:47 +0000
commit52ddea91eec97293cb44d4f49fac320b1f3cc47c (patch)
tree0e28ebe9cf5427cd59f90816d2dde3c1759a5f71 /share
parentcf1be672647f9696dbccf7decb4ca9db06c2792a (diff)
QmlDesigner: Add missing properties to LineEdit and ComboBox
Change-Id: I7e9a9159aa75973f04a660a16c2d00aa294ab944 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml4
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml2
2 files changed, 6 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
index 18f30dce1c..6517860632 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
@@ -45,6 +45,8 @@ Controls.ComboBox {
property bool block: false
+ property bool showExtendedFunctionButton: true
+
ExtendedFunctionLogic {
id: extFuncLogic
backendValue: comboBox.backendValue
@@ -54,6 +56,8 @@ Controls.ComboBox {
actionIndicator.icon.text: extFuncLogic.glyph
actionIndicator.onClicked: extFuncLogic.show()
+ actionIndicator.visible: showExtendedFunctionButton
+
ColorLogic {
id: colorLogic
backendValue: comboBox.backendValue
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
index 18b25924b3..0dfa558c09 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
@@ -45,6 +45,8 @@ Controls.TextField {
property bool showExtendedFunctionButton: true
+ actionIndicator.visible: showExtendedFunctionButton
+
signal commitData
property string context