From 062006b07f3d67b7f1d9f78c3969b41d41921758 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 Aug 2021 15:01:16 +0200 Subject: [PATCH] Android: Use FileUtils in AndroidDeployQtStep::createConfigWidget Change-Id: Ib2ca0dbcdc811a6c130bf921845484b95039d076 Reviewed-by: Alessandro Portale --- src/plugins/android/androiddeployqtstep.cpp | 10 +++++----- src/plugins/android/androidmanager.cpp | 4 ++-- src/plugins/android/androidmanager.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 5ac1a2a210b..2b1379c1c2e 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -510,11 +510,11 @@ QWidget *AndroidDeployQtStep::createConfigWidget() installCustomApkButton->setText(tr("Install an APK File")); connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, widget] { - const QString packagePath - = QFileDialog::getOpenFileName(widget, - tr("Qt Android Installer"), - QDir::homePath(), - tr("Android package (*.apk)")); + const FilePath packagePath + = FileUtils::getOpenFilePath(widget, + tr("Qt Android Installer"), + FileUtils::homePath(), + tr("Android package (*.apk)")); if (!packagePath.isEmpty()) AndroidManager::installQASIPackage(target(), packagePath); }); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index fe6994b7032..45fc9d64ce2 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -505,7 +505,7 @@ static int parseMinSdk(const QDomElement &manifestElem) return 0; } -void AndroidManager::installQASIPackage(Target *target, const QString &packagePath) +void AndroidManager::installQASIPackage(Target *target, const FilePath &packagePath) { const QStringList appAbis = AndroidManager::applicationAbis(target); if (appAbis.isEmpty()) @@ -523,7 +523,7 @@ void AndroidManager::installQASIPackage(Target *target, const QString &packagePa } QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); - arguments << "install" << "-r " << packagePath; + arguments << "install" << "-r " << packagePath.path(); QString error; if (!runAdbCommandDetached(arguments, &error, true)) Core::MessageManager::writeDisrupting( diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index 62448332ac0..fba589a3dba 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -103,7 +103,7 @@ public: static QPair apiLevelRange(); static QString androidNameForApiLevel(int x); - static void installQASIPackage(ProjectExplorer::Target *target, const QString &packagePath); + static void installQASIPackage(ProjectExplorer::Target *target, const Utils::FilePath &packagePath); static bool checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd); static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd,