From e788d0e8daff48c4505e13b6486431c03f9f9d44 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Tue, 21 Mar 2023 13:25:46 +0100
Subject: [PATCH] ProjectExplorer: Make sure all changes to device settings are
 applied

The old "editingFinished on macOS" problem hits again.
A cursory glance seems to suggest the required call to
updateDeviceFromUi() was missing already in the original patch
dff0761406c89ece9a562bbac02323a886ed3e34.

Change-Id: Id286417962010bfffe98169b55fb42e3480b03f6
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 .../projectexplorer/devicesupport/devicesettingswidget.cpp       | 1 +
 .../remotelinux/genericlinuxdeviceconfigurationwidget.cpp        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
index 27ad8252ab0..39af4713455 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
@@ -251,6 +251,7 @@ void DeviceSettingsWidget::updateDeviceFromUi()
 
 void DeviceSettingsWidget::saveSettings()
 {
+    updateDeviceFromUi();
     ICore::settings()->setValueWithDefault(LastDeviceIndexKey, currentIndex(), 0);
     DeviceManager::replaceInstance();
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 23534a902fc..50c553437f6 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -223,6 +223,7 @@ void GenericLinuxDeviceConfigurationWidget::updateDeviceFromUi()
     keyFileEditingFinished();
     handleFreePortsChanged();
     gdbServerEditingFinished();
+    qmlRuntimeEditingFinished();
 }
 
 void GenericLinuxDeviceConfigurationWidget::updatePortsWarningLabel()