From a99845633872c33c4ecb5f85ec034bb6133514de Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 28 Jun 2023 16:40:03 +0200 Subject: [PATCH] Perforce: Use a FilePathAspect for the p4 binary Change-Id: I9bdb04192887f72d37bee04d13450cb9f85f9bc2 Reviewed-by: Reviewed-by: Orgad Shaneh --- src/plugins/perforce/perforcesettings.cpp | 1 - src/plugins/perforce/perforcesettings.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp index 42201b208a0..dc5036bbbba 100644 --- a/src/plugins/perforce/perforcesettings.cpp +++ b/src/plugins/perforce/perforcesettings.cpp @@ -35,7 +35,6 @@ PerforceSettings::PerforceSettings() setSettingsGroup("Perforce"); setAutoApply(false); - p4BinaryPath.setDisplayStyle(StringAspect::PathChooserDisplay); p4BinaryPath.setSettingsKey("Command"); p4BinaryPath.setDefaultValue( Environment::systemEnvironment().searchInPath(defaultCommand()).toString()); diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h index 0801c310907..bbd8e43ef65 100644 --- a/src/plugins/perforce/perforcesettings.h +++ b/src/plugins/perforce/perforcesettings.h @@ -68,7 +68,7 @@ public: void clearTopLevel(); - Utils::StringAspect p4BinaryPath{this}; + Utils::FilePathAspect p4BinaryPath{this}; Utils::StringAspect p4Port{this}; Utils::StringAspect p4Client{this}; Utils::StringAspect p4User{this};