diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-23 10:11:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-23 10:11:44 +0200 |
| commit | 423ea729f801e8e1a6e35fc9b09d02f1375ddefd (patch) | |
| tree | 13652a6f6dbbd172da0b2bbef8ab461140167d5d /src/plugins/qmldesigner/components/componentcore | |
| parent | 834cb8d114110d4905c007f45841fd1045851ec7 (diff) | |
| parent | a003a2e9f3a45413480bb7070ad9da5621094d0e (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/mcusupport/mcusupportoptions.cpp
Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef
Diffstat (limited to 'src/plugins/qmldesigner/components/componentcore')
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 55438be21d..a24fed1592 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -405,8 +405,10 @@ public: static bool isListViewInBaseState(const SelectionContext &selectionState) { return selectionState.isInBaseState() && selectionState.singleNodeIsSelected() - && selectionState.currentSingleSelectedNode().metaInfo().isSubclassOf( - "QtQuick.ListView"); + && (selectionState.currentSingleSelectedNode().metaInfo().isSubclassOf( + "QtQuick.ListView") + || selectionState.currentSingleSelectedNode().metaInfo().isSubclassOf( + "QtQuick.GridView")); } bool isEnabled(const SelectionContext &) const override { return true; } |