From beb9fc2fde620f43e1f4df4493f239f5301b5e45 Mon Sep 17 00:00:00 2001
From: Shrief Gabr <shrief.gabr@qt.io>
Date: Wed, 27 Mar 2024 14:28:18 +0200
Subject: QmlDesigner: Prevent data scramble after sorting

Task-number: QDS-12160
Change-Id: I3a90583a097b3074d9502668e4b3670fa81f34a2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
---
 .../collectionEditorQmlSource/CollectionDetailsView.qml      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'share/qtcreator')

diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
index 6420f197bd9..3bb48ef3a6a 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
@@ -155,12 +155,18 @@ Rectangle {
 
                     StudioControls.MenuItem {
                         text: qsTr("Sort Ascending")
-                        onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder)
+                        onTriggered: {
+                            tableView.closeEditor()
+                            tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.AscendingOrder)
+                        }
                     }
 
                     StudioControls.MenuItem {
                         text: qsTr("Sort Descending")
-                        onTriggered: sortedModel.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder)
+                        onTriggered: {
+                            tableView.closeEditor()
+                            tableView.model.sort(headerMenu.clickedHeaderIndex, Qt.DescendingOrder)
+                        }
                     }
                 }
             }
@@ -192,7 +198,7 @@ Rectangle {
             TableView {
                 id: tableView
 
-                model: root.model
+                model: root.sortedModel
                 clip: true
 
                 readonly property real maxAvailableHeight: gridLayout.maxAvailableHeight
-- 
cgit v1.2.3