From 0a6acda56b84f566b65ec144719e7ecbac89b629 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 16 Mar 2023 20:25:18 +0100
Subject: [PATCH] QmlDesigner: Fix for top level combobox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QDS-9459
Change-Id: I971db90adefbabcc84e910dfabef43b06172637b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../imports/StudioControls/TopLevelComboBox.qml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
index 06b715ddbf8..9c200a23972 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
@@ -134,12 +134,12 @@ T.ComboBox {
         interactive: false
         model: control.model
         Keys.onEscapePressed: comboBoxPopup.close()
+        currentIndex: control.highlightedIndex
 
         delegate: ItemDelegate {
             id: itemDelegate
 
             onClicked: {
-                control.currentIndex = index
                 control.activated(index)
                 comboBoxPopup.close()
             }