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

Conan: CPaster: Use FilePathAspect

Browse Source 
Change-Id: I982ae4115af818cc25c46acc84713e7432b18548
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-05-23 14:37:19 +02:00
parent b6a1935562
commit f952fe30e7
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/conan/conaninstallstep.cpp
View File

@@ -70,13 +70,12 @@ ConanInstallStep::ConanInstallStep(BuildStepList *bsl, Id id)
setUseEnglishOutput(); setUseEnglishOutput();
setDisplayName(Tr::tr("Conan install")); setDisplayName(Tr::tr("Conan install"));
auto conanFile = addAspect<StringAspect>(); auto conanFile = addAspect<FilePathAspect>();
conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile"); conanFile->setSettingsKey("ConanPackageManager.InstallStep.ConanFile");
conanFile->setFilePath(conanFilePath(project(), conanFile->setFilePath(conanFilePath(project(),
project()->projectDirectory() / "conanfile.txt")); project()->projectDirectory() / "conanfile.txt"));
conanFile->setLabelText(Tr::tr("Conan file:")); conanFile->setLabelText(Tr::tr("Conan file:"));
conanFile->setToolTip(Tr::tr("Enter location of conanfile.txt or conanfile.py.")); conanFile->setToolTip(Tr::tr("Enter location of conanfile.txt or conanfile.py."));
conanFile->setDisplayStyle(StringAspect::PathChooserDisplay);
conanFile->setExpectedKind(PathChooser::File); conanFile->setExpectedKind(PathChooser::File);
auto additionalArguments = addAspect<StringAspect>(); auto additionalArguments = addAspect<StringAspect>();

1
src/plugins/cpaster/fileshareprotocolsettingspage.cpp
View File

@@ -22,7 +22,6 @@ FileShareProtocolSettings::FileShareProtocolSettings()
registerAspect(&path); registerAspect(&path);
path.setSettingsKey("Path"); path.setSettingsKey("Path");
path.setDisplayStyle(StringAspect::PathChooserDisplay);
path.setExpectedKind(PathChooser::ExistingDirectory); path.setExpectedKind(PathChooser::ExistingDirectory);
path.setDefaultValue(TemporaryDirectory::masterDirectoryPath()); path.setDefaultValue(TemporaryDirectory::masterDirectoryPath());
path.setLabelText(Tr::tr("&Path:")); path.setLabelText(Tr::tr("&Path:"));

2
src/plugins/cpaster/fileshareprotocolsettingspage.h
View File

@@ -12,7 +12,7 @@ class FileShareProtocolSettings : public Core::PagedSettings
public: public:
FileShareProtocolSettings(); FileShareProtocolSettings();
Utils::StringAspect path; Utils::FilePathAspect path;
Utils::IntegerAspect displayCount; Utils::IntegerAspect displayCount;
}; };