summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2021-03-15 10:31:40 +0100
committerhjk <hjk@qt.io>2021-03-16 08:12:34 +0000
commit2756794b4fd7cdae60026cf2a8031fcca1578c95 (patch)
tree26f94ba7c2d1b642d0b5268bfc458e26e708c0be /src/plugins
parent06a754cc74d9969238ce81335877ef1b0efce68d (diff)
downloadqt-creator-2756794b4fd7cdae60026cf2a8031fcca1578c95.tar.gz
Utils: Drop deprecated Utils::FilePath::{setFilePath,filePath}
Change-Id: I730dfb716f744bbcb62dedf611e93c0d2d358247 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/android/androidsettingswidget.cpp2
-rw-r--r--src/plugins/cvs/settingspage.cpp2
-rw-r--r--src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp2
-rw-r--r--src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp4
-rw-r--r--src/plugins/subversion/settingspage.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index fd25d12ae1..51b837af0f 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -600,7 +600,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists())
currentOpenSslPath = sdkPath.pathAppended("android_openssl");
- m_ui.openSslPathChooser->setFileName(currentOpenSslPath);
+ m_ui.openSslPathChooser->setFilePath(currentOpenSslPath);
// Package reload will trigger validateSdk.
m_sdkManager.reloadPackages();
}
diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp
index 8aae51fa59..82f9cad886 100644
--- a/src/plugins/cvs/settingspage.cpp
+++ b/src/plugins/cvs/settingspage.cpp
@@ -64,7 +64,7 @@ CvsSettingsPageWidget::CvsSettingsPageWidget(const std::function<void()> &onAppl
m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
const VcsBaseClientSettings &s = *settings;
- m_ui.commandPathChooser->setFileName(s.binaryPath());
+ m_ui.commandPathChooser->setFilePath(s.binaryPath());
m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey));
m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey));
m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey));
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
index 2bf9b22648..a1ba99d360 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
@@ -57,7 +57,7 @@ void ToolItemSettings::load(ToolTreeItem *item)
ui->mesonNameLineEdit->setDisabled(item->isAutoDetected());
ui->mesonNameLineEdit->setText(item->name());
ui->mesonPathChooser->setDisabled(item->isAutoDetected());
- ui->mesonPathChooser->setFileName(item->executable());
+ ui->mesonPathChooser->setFilePath(item->executable());
m_currentId = item->id();
} else {
m_currentId = Utils::nullopt;
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
index 86c9d53b41..0c6a8a46f7 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
@@ -80,7 +80,7 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath,
{
m_ui->setupUi(this);
- m_ui->exportPath->setFileName(exportPath);
+ m_ui->exportPath->setFilePath(exportPath);
m_ui->exportPath->setPromptDialogTitle(tr("Choose Export Path"));
m_ui->exportPath->lineEdit()->setReadOnly(true);
m_ui->exportPath->addButton(tr("Open"), this, [this]() {
@@ -153,7 +153,7 @@ void AssetExportDialog::onExport()
TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT);
m_exportLogs->clear();
- m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->fileName(),
+ m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->filePath(),
m_exportAssetsCheck->isChecked(),
m_perComponentExportCheck->isChecked());
}
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index e714dfcde9..2ee4aaad5c 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -69,7 +69,7 @@ SubversionSettingsPageWidget::SubversionSettingsPageWidget(const std::function<v
m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
SubversionSettings &s = *m_settings;
- m_ui.pathChooser->setFileName(s.binaryPath());
+ m_ui.pathChooser->setFilePath(s.binaryPath());
m_ui.usernameLineEdit->setText(s.stringValue(SubversionSettings::userKey));
m_ui.passwordLineEdit->setText(s.stringValue(SubversionSettings::passwordKey));
m_ui.userGroupBox->setChecked(s.boolValue(SubversionSettings::useAuthenticationKey));