aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidsettingswidget.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-04-09 11:05:50 +0200
committerhjk <hjk@qt.io>2020-04-09 17:30:23 +0000
commit79b680e7f0b0ff5ecca9b17fabb11fd03947ec8f (patch)
treeec8f594ed02b1a55869ade473130efb806b20ca1 /src/plugins/android/androidsettingswidget.cpp
parent45ba9fcd535e4cfd5f057149b1ca4bb4dfed5bdb (diff)
Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()
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>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.cpp')
-rw-r--r--src/plugins/android/androidsettingswidget.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 8835df58ec1..8169358d943 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -477,21 +477,21 @@ AndroidSettingsWidget::AndroidSettingsWidget()
Utils::FilePath currentJdkPath = m_androidConfig.openJDKLocation();
if (currentJdkPath.isEmpty())
currentJdkPath = findJdkInCommonPaths();
- m_ui->OpenJDKLocationPathChooser->setFileName(currentJdkPath);
+ m_ui->OpenJDKLocationPathChooser->setFilePath(currentJdkPath);
m_ui->OpenJDKLocationPathChooser->setPromptDialogTitle(tr("Select JDK Path"));
Utils::FilePath currentSDKPath = m_androidConfig.sdkLocation();
if (currentSDKPath.isEmpty())
currentSDKPath = getDefaultSdkPath();
- m_ui->SDKLocationPathChooser->setFileName(currentSDKPath);
+ m_ui->SDKLocationPathChooser->setFilePath(currentSDKPath);
m_ui->SDKLocationPathChooser->setPromptDialogTitle(tr("Select Android SDK folder"));
m_ui->openSslPathChooser->setPromptDialogTitle(tr("Select OpenSSL Include Project File"));
Utils::FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
if (currentOpenSslPath.isEmpty())
currentOpenSslPath = currentSDKPath.pathAppended("android_openssl");
- m_ui->openSslPathChooser->setFileName(currentOpenSslPath);
+ m_ui->openSslPathChooser->setFilePath(currentOpenSslPath);
m_ui->DataPartitionSizeSpinBox->setValue(m_androidConfig.partitionSize());
m_ui->CreateKitCheckBox->setChecked(m_androidConfig.automaticKitCreation());
@@ -808,7 +808,7 @@ void AndroidSettingsWidget::openOpenJDKDownloadUrl()
void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
{
- const Utils::FilePath openSslPath = m_ui->openSslPathChooser->fileName();
+ const Utils::FilePath openSslPath = m_ui->openSslPathChooser->filePath();
const QString openSslCloneTitle(tr("OpenSSL Cloning"));
auto openSslSummaryWidget = static_cast<SummaryWidget *>(m_ui->openSslDetailsWidget->widget());