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

Android: Use FileUtils in AndroidDeployQtStep::createConfigWidget

Browse Source 
Change-Id: Ib2ca0dbcdc811a6c130bf921845484b95039d076
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-08-17 15:01:16 +02:00
parent d119c717c1
commit 062006b07f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -510,10 +510,10 @@ QWidget *AndroidDeployQtStep::createConfigWidget()
installCustomApkButton->setText(tr("Install an APK File")); installCustomApkButton->setText(tr("Install an APK File"));
connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, widget] { connect(installCustomApkButton, &QAbstractButton::clicked, this, [this, widget] {
const QString packagePath const FilePath packagePath
= QFileDialog::getOpenFileName(widget, = FileUtils::getOpenFilePath(widget,
tr("Qt Android Installer"), tr("Qt Android Installer"),
QDir::homePath(), FileUtils::homePath(),
tr("Android package (*.apk)")); tr("Android package (*.apk)"));
if (!packagePath.isEmpty()) if (!packagePath.isEmpty())
AndroidManager::installQASIPackage(target(), packagePath); AndroidManager::installQASIPackage(target(), packagePath);

4
src/plugins/android/androidmanager.cpp
View File

@@ -505,7 +505,7 @@ static int parseMinSdk(const QDomElement &manifestElem)
return 0; return 0;
} }
void AndroidManager::installQASIPackage(Target *target, const QString &packagePath) void AndroidManager::installQASIPackage(Target *target, const FilePath &packagePath)
{ {
const QStringList appAbis = AndroidManager::applicationAbis(target); const QStringList appAbis = AndroidManager::applicationAbis(target);
if (appAbis.isEmpty()) if (appAbis.isEmpty())
@@ -523,7 +523,7 @@ void AndroidManager::installQASIPackage(Target *target, const QString &packagePa
} }
QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber); QStringList arguments = AndroidDeviceInfo::adbSelector(deviceSerialNumber);
arguments << "install" << "-r " << packagePath; arguments << "install" << "-r " << packagePath.path();
QString error; QString error;
if (!runAdbCommandDetached(arguments, &error, true)) if (!runAdbCommandDetached(arguments, &error, true))
Core::MessageManager::writeDisrupting( Core::MessageManager::writeDisrupting(

2
src/plugins/android/androidmanager.h
View File

@@ -103,7 +103,7 @@ public:
static QPair<int, int> apiLevelRange(); static QPair<int, int> apiLevelRange();
static QString androidNameForApiLevel(int x); 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 checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd);
static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd,