From abc055931653f7fda344462aa98cb675ac6306d7 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Mon, 22 Feb 2021 16:53:30 +0200
Subject: [PATCH] Fix property editor expand not working regression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regression caused by 43eaa09b114355aa344c02cbccb70201e75dd05f

Change-Id: Ia749672464790b235f292efe09b6cc48e1df6b6e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/itemLibraryQmlSources/ItemsView.qml         | 2 ++
 .../imports/HelperWidgets/Section.qml                       | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
index 0e586827bfe..1f4ad7ddfd0 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml
@@ -138,6 +138,7 @@ ScrollView {
                 topPadding: 0
                 bottomPadding: 0
                 expanded: importExpanded
+                expandOnClick: false
                 onToggleExpand: importExpanded = !importExpanded
                 onShowContextMenu: {
                     importToRemove = importUsed ? "" : importUrl
@@ -161,6 +162,7 @@ ScrollView {
                             caption: categoryName + " (" + itemModel.rowCount() + ")"
                             visible: categoryVisible
                             expanded: categoryExpanded
+                            expandOnClick: false
                             onToggleExpand: categoryExpanded = !categoryExpanded
 
                             Grid {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
index 8669cd73964..e3b37cb9186 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
@@ -47,6 +47,7 @@ Item {
     property int level: 0
     property int levelShift: 10
     property bool hideHeader: false
+    property bool expandOnClick: true // if false, toggleExpand signal will be emitted instead
 
     onHideHeaderChanged:
     {
@@ -92,7 +93,10 @@ Item {
             onClicked: {
                 if (mouse.button === Qt.LeftButton) {
                     trans.enabled = true
-                    section.toggleExpand()
+                    if (expandOnClick)
+                        expanded = !expanded
+                    else
+                        section.toggleExpand()
                 } else {
                     section.showContextMenu()
                 }