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

Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()

Browse Source 
It's returning a FilePath, so it's a better fit.

Keep the old versions as inline function now to ease downstream migration.

Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
hjk
2020-04-09 11:05:50 +02:00
parent 45ba9fcd53
commit 79b680e7f0
44 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -680,7 +680,7 @@ void QbsBuildStepConfigWidget::updateState()
cleanInstallRootCheckBox->setChecked(qbsStep()->cleanInstallRoot());
forceProbesCheckBox->setChecked(qbsStep()->forceProbes());
updatePropertyEdit(qbsStep()->qbsConfiguration(QbsBuildStep::PreserveVariables));
installDirChooser->setFileName(qbsStep()->installRoot(QbsBuildStep::PreserveVariables));
installDirChooser->setFilePath(qbsStep()->installRoot(QbsBuildStep::PreserveVariables));
defaultInstallDirCheckBox->setChecked(!qbsStep()->hasCustomInstallRoot());
}

6
src/plugins/qbsprojectmanager/qbssettings.cpp
View File

@@ -138,7 +138,7 @@ public:
SettingsWidget()
{
m_qbsExePathChooser.setExpectedKind(PathChooser::ExistingCommand);
m_qbsExePathChooser.setFileName(QbsSettings::qbsExecutableFilePath());
m_qbsExePathChooser.setFilePath(QbsSettings::qbsExecutableFilePath());
m_defaultInstallDirLineEdit.setText(QbsSettings::defaultInstallDirTemplate());
m_versionLabel.setText(getQbsVersion());
m_settingsDirCheckBox.setText(tr("Use %1 settings directory for Qbs")
@@ -155,8 +155,8 @@ public:
void apply()
{
QbsSettingsData settings = QbsSettings::rawSettingsData();
if (m_qbsExePathChooser.fileName() != QbsSettings::qbsExecutableFilePath())
settings.qbsExecutableFilePath = m_qbsExePathChooser.fileName();
if (m_qbsExePathChooser.filePath() != QbsSettings::qbsExecutableFilePath())
settings.qbsExecutableFilePath = m_qbsExePathChooser.filePath();
settings.defaultInstallDirTemplate = m_defaultInstallDirLineEdit.text();
settings.useCreatorSettings = m_settingsDirCheckBox.isChecked();
QbsSettings::setSettingsData(settings);