From b0f68a916fa4086b0b304a6b374a22e0a0e80015 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 19 May 2023 11:30:57 +0200 Subject: [PATCH] Vcpkg: Use Utils::FilePathAspect Change-Id: I7532536186d500748e3ad30794801436c0a997e2 Reviewed-by: hjk --- src/plugins/vcpkg/vcpkgsearch.cpp | 2 +- src/plugins/vcpkg/vcpkgsettings.cpp | 3 +-- src/plugins/vcpkg/vcpkgsettings.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/vcpkg/vcpkgsearch.cpp b/src/plugins/vcpkg/vcpkgsearch.cpp index a2ec2c66c28..1e2d28f74ab 100644 --- a/src/plugins/vcpkg/vcpkgsearch.cpp +++ b/src/plugins/vcpkg/vcpkgsearch.cpp @@ -94,7 +94,7 @@ VcpkgPackageSearchDialog::VcpkgPackageSearchDialog(QWidget *parent) m_buttonBox, }.attachTo(this); - m_allPackages = vcpkgManifests(VcpkgSettings::instance()->vcpkgRoot.filePath()); + m_allPackages = vcpkgManifests(VcpkgSettings::instance()->vcpkgRoot()); listPackages({}); diff --git a/src/plugins/vcpkg/vcpkgsettings.cpp b/src/plugins/vcpkg/vcpkgsettings.cpp index 85b4b6f4faa..eb3c71c0b4d 100644 --- a/src/plugins/vcpkg/vcpkgsettings.cpp +++ b/src/plugins/vcpkg/vcpkgsettings.cpp @@ -61,7 +61,6 @@ VcpkgSettings::VcpkgSettings() registerAspect(&vcpkgRoot); vcpkgRoot.setSettingsKey("VcpkgRoot"); - vcpkgRoot.setDisplayStyle(Utils::StringAspect::PathChooserDisplay); vcpkgRoot.setExpectedKind(Utils::PathChooser::ExistingDirectory); vcpkgRoot.setDefaultValue(Utils::qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT)); @@ -70,7 +69,7 @@ VcpkgSettings::VcpkgSettings() bool VcpkgSettings::vcpkgRootValid() const { - return (vcpkgRoot.filePath() / "vcpkg").withExecutableSuffix().isExecutableFile(); + return (vcpkgRoot() / "vcpkg").withExecutableSuffix().isExecutableFile(); } } // namespace Vcpkg::Internal diff --git a/src/plugins/vcpkg/vcpkgsettings.h b/src/plugins/vcpkg/vcpkgsettings.h index fb1c478fc4f..bbff08035ab 100644 --- a/src/plugins/vcpkg/vcpkgsettings.h +++ b/src/plugins/vcpkg/vcpkgsettings.h @@ -15,7 +15,7 @@ public: static VcpkgSettings *instance(); bool vcpkgRootValid() const; - Utils::StringAspect vcpkgRoot; + Utils::FilePathAspect vcpkgRoot; }; } // namespace Vcpkg::Internal