diff options
author | Aleksei German <aleksei.german@qt.io> | 2020-09-02 18:34:22 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-09-03 08:39:26 +0000 |
commit | b11bfd56526c133300cf466560ecd28883a9466d (patch) | |
tree | 01ff4d0c0c81627a98deaea0e473e4eae8ddff07 /src | |
parent | fd32b222ee1824ec610469fa411c3b914fca596d (diff) |
QmlDesigner: Disable more properties for QUL
Disabling more items in ItemLibrary and properties
Change-Id: Ib019c1cbe356e0f7e3889d3500c080b0f5756c34
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp | 25 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp | 10 |
2 files changed, 28 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 273d4adf5a..a106d7924e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -213,26 +213,37 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) "QtQuick.Flow", "QtQuick.Grid", "QtQuick.GridView", - "QtQuick.Controls.ButtonGroup", + "QtQuick.PathView", "QtQuick.Controls", + "QtQuick.Controls.BusyIndicator", + "QtQuick.Controls.ButtonGroup", + "QtQuick.Controls.CheckDelegate", "QtQuick.Controls.Container", - "QtQuick.Controls.DelayButton", "QtQuick.Controls.ComboBox", + "QtQuick.Controls.DelayButton", "QtQuick.Controls.Frame", "QtQuick.Controls.GroupBox", "QtQuick.Controls.ItemDelegate", - "QtQuick.Controls.SpinBox", + "QtQuick.Controls.Label", + "QtQuick.Controls.Page", + "QtQuick.Controls.PageIndicator", + "QtQuick.Controls.Pane", "QtQuick.Controls.RadioDelegate", + "QtQuick.Controls.RangeSlider", "QtQuick.Controls.RoundButton", "QtQuick.Controls.ScrollView", - "QtQuick.Controls.RangeSlider", + "QtQuick.Controls.SpinBox", + "QtQuick.Controls.StackView", + "QtQuick.Controls.SwipeDelegate", + "QtQuick.Controls.SwitchDelegate", "QtQuick.Controls.ToolBar", - "QtQuick.Controls.TooButton", + "QtQuick.Controls.ToolButton", "QtQuick.Controls.TabBar", "QtQuick.Controls.TabButton", - "QtQuick.Controls.SwitchDelegate", "QtQuick.Controls.TextArea", - "QtQuick.Controls.TextField"}; + "QtQuick.Controls.TextField", + "QtQuick.Controls.ToolSeparator", + "QtQuick.Controls.Tumbler"}; if (blockTypes.contains(entry.typeName())) valid = false; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index a27a5d1b7e..d2c0c71f7d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -289,12 +289,22 @@ static QList<QByteArray> prepareNonMcuProperties() const QList<QByteArray> textProperties = {"elide", "lineHeight", "lineHeightMode", "wrapMode", "style", "styleColor", "minimumPointSize", "minimumPixelSize", "styleColor", "fontSizeMode", "renderType", "textFormat", "maximumLineCount"}; + const QList<QByteArray> paddingProperties = {"bottomPadding", "topPadding", "leftPadding", "rightPadding"}; + const QList<QByteArray> columnRowProperties = {"layoutDirection"}; + const QList<QByteArray> listViewProperties = {"cacheBuffer", "highlightRangeMode", "highlightMoveDuration", + "highlightResizeDuration", "preferredHighlightBegin", "layoutDirection", + "preferredHighlightEnd", "highlightFollowsCurrentItem", "keyNavigationWraps", + "snapMode", "highlightMoveVelocity", "highlightResizeVelocity"}; result.append(itemProperties); result.append(mouseAreaProperties); result.append(flickableProperties); result.append(imageProperties); result.append(textProperties); + result.append(paddingProperties); + result.append(columnRowProperties); + result.append(listViewProperties); + return result; } |