feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: BareMetal: Fix history completer

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Christian Stenger
2018-05-03 08:29:57 +02:00
parent fea16708b7
commit 8559df7bc9
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
View File

@@ -45,6 +45,7 @@ BareMetalCustomRunConfiguration::BareMetalCustomRunConfiguration(Target *target,
exeAspect->setSettingsKey("BareMetal.CustomRunConfig.Executable"); exeAspect->setSettingsKey("BareMetal.CustomRunConfig.Executable");
exeAspect->setPlaceHolderText(tr("Unknown")); exeAspect->setPlaceHolderText(tr("Unknown"));
exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
exeAspect->setHistoryCompleter("BareMetal.CustomRunConfig.History");
exeAspect->setExpectedKind(PathChooser::Any); exeAspect->setExpectedKind(PathChooser::Any);
addExtraAspect(exeAspect); addExtraAspect(exeAspect);

1
src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
View File

@@ -48,6 +48,7 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *tar
exeAspect->setLabelText(tr("Remote Executable:")); exeAspect->setLabelText(tr("Remote Executable:"));
exeAspect->setExecutablePathStyle(OsTypeLinux); exeAspect->setExecutablePathStyle(OsTypeLinux);
exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay); exeAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
exeAspect->setHistoryCompleter("RemoteLinux.CustomExecutable.History");
exeAspect->setExpectedKind(PathChooser::Any); exeAspect->setExpectedKind(PathChooser::Any);
addExtraAspect(exeAspect); addExtraAspect(exeAspect);

1
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
View File

@@ -52,6 +52,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I
exeAspect->setPlaceHolderText(tr("Remote path not set")); exeAspect->setPlaceHolderText(tr("Remote path not set"));
exeAspect->makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable", exeAspect->makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable",
"RemoteLinux.RunConfig.UseAlternateRemoteExecutable"); "RemoteLinux.RunConfig.UseAlternateRemoteExecutable");
exeAspect->setHistoryCompleter("RemoteLinux.AlternateExecutable.History");
addExtraAspect(exeAspect); addExtraAspect(exeAspect);
auto symbolsAspect = new SymbolFileAspect(this); auto symbolsAspect = new SymbolFileAspect(this);