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

CMake: Use a FilePathAsepect for the staging directory

Browse Source 
Change-Id: Id4ac0cdaa3a773f740f474e78a7af104996a5504
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2023-05-23 14:33:39 +02:00
parent a0f64b133d
commit 3ecaabf5e9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -197,10 +197,9 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
m_useStaging->setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBoxWithoutDummyLabel); m_useStaging->setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBoxWithoutDummyLabel);
m_useStaging->setDefaultValue(!buildAndRunOnSameDevice(kit())); m_useStaging->setDefaultValue(!buildAndRunOnSameDevice(kit()));
m_stagingDir = addAspect<StringAspect>(); m_stagingDir = addAspect<FilePathAspect>();
m_stagingDir->setSettingsKey(STAGING_DIR_KEY); m_stagingDir->setSettingsKey(STAGING_DIR_KEY);
m_stagingDir->setLabelText(Tr::tr("Staging directory:")); m_stagingDir->setLabelText(Tr::tr("Staging directory:"));
m_stagingDir->setDisplayStyle(StringAspect::PathChooserDisplay);
m_stagingDir->setDefaultValue(initialStagingDir()); m_stagingDir->setDefaultValue(initialStagingDir());
Kit *kit = buildConfiguration()->kit(); Kit *kit = buildConfiguration()->kit();

2
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -108,7 +108,7 @@ private:
Utils::StringAspect *m_toolArguments = nullptr; Utils::StringAspect *m_toolArguments = nullptr;
Utils::BoolAspect *m_useiOSAutomaticProvisioningUpdates = nullptr; Utils::BoolAspect *m_useiOSAutomaticProvisioningUpdates = nullptr;
Utils::BoolAspect *m_useStaging = nullptr; Utils::BoolAspect *m_useStaging = nullptr;
Utils::StringAspect *m_stagingDir = nullptr; Utils::FilePathAspect *m_stagingDir = nullptr;
QString m_allTarget = "all"; QString m_allTarget = "all";
QString m_installTarget = "install"; QString m_installTarget = "install";