From 8559df7bc94a496c295845a14556788fd130ca49 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 3 May 2018 08:29:57 +0200 Subject: [PATCH] RemoteLinux: BareMetal: Fix history completer History completers need a respective key to work properly and become restorable. This patch avoids some soft asserts and warnings regarding empty settings keys. Change-Id: I7d24d738b29167b7ab9714b4c6d54dbc1f7e1181 Reviewed-by: hjk --- src/plugins/baremetal/baremetalcustomrunconfiguration.cpp | 1 + src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp | 1 + src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp index 86cb9df784f..667c278e85d 100644 --- a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp +++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp @@ -45,6 +45,7 @@ BareMetalCustomRunConfiguration::BareMetalCustomRunConfiguration(Target *target, exeAspect->setSettingsKey("BareMetal.CustomRunConfig.Executable"); exeAspect->setPlaceHolderText(tr("Unknown")); exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); + exeAspect->setHistoryCompleter("BareMetal.CustomRunConfig.History"); exeAspect->setExpectedKind(PathChooser::Any); addExtraAspect(exeAspect); diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp index 482cd95ec07..a44b9ecd4eb 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp @@ -48,6 +48,7 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *tar exeAspect->setLabelText(tr("Remote Executable:")); exeAspect->setExecutablePathStyle(OsTypeLinux); exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); + exeAspect->setHistoryCompleter("RemoteLinux.CustomExecutable.History"); exeAspect->setExpectedKind(PathChooser::Any); addExtraAspect(exeAspect); diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 981c031d9b2..2f16858b682 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -52,6 +52,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I exeAspect->setPlaceHolderText(tr("Remote path not set")); exeAspect->makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable", "RemoteLinux.RunConfig.UseAlternateRemoteExecutable"); + exeAspect->setHistoryCompleter("RemoteLinux.AlternateExecutable.History"); addExtraAspect(exeAspect); auto symbolsAspect = new SymbolFileAspect(this);