diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 12:39:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 13:58:05 +0200 |
| commit | d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25 (patch) | |
| tree | 0fa42e55e8aa480982d8f1d9561cbfffd3501c7d /share | |
| parent | 02785342acc1580210e6d69b5893c431ddc0c009 (diff) | |
| parent | 20b095c6b4b9bd394a4ad6062a588de5bbf14b52 (diff) | |
| download | qt-creator-d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25.tar.gz | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml index 5b0a61d5c0..e1d177fe07 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml @@ -51,6 +51,8 @@ Rectangle { property real __actionIndicatorWidth: StudioTheme.Values.squareComponentWidth property real __actionIndicatorHeight: StudioTheme.Values.height + property string typeFilter: "QtQuick3D.Material" + color: "transparent" border.color: StudioTheme.Values.themeControlOutline border.width: StudioTheme.Values.border @@ -69,7 +71,7 @@ Rectangle { validator: RegExpValidator { regExp: /(^[a-z_]\w*|^[A-Z]\w*\.{1}([a-z_]\w*\.?)+)/ } actionIndicatorVisible: false - typeFilter: "QtQuick3D.Material" + typeFilter: editableListView.typeFilter editText: modelData initialModelData: modelData |