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

Android: Use FilePath for AndroidBuildApkStep::m_packagePath

Browse Source 
Change-Id: I7088d34f7931674f7638c5981d2b8c27e18335bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-08-12 12:08:08 +02:00
parent ba745a45aa
commit 470724ad21
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,9 +557,9 @@ bool AndroidBuildApkStep::init()
: QLatin1String("debug"); : QLatin1String("debug");
m_packagePath = buildDirectory() m_packagePath = buildDirectory()
.pathAppended(Constants::ANDROID_BUILDDIRECTORY) .pathAppended(Constants::ANDROID_BUILDDIRECTORY)
.pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(bt)).toString(); .pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(bt));
} else { } else {
m_packagePath = AndroidManager::apkPath(target()).toString(); m_packagePath = AndroidManager::apkPath(target());
} }
qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath; qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath;
@@ -650,7 +650,7 @@ void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter)
void AndroidBuildApkStep::showInGraphicalShell() void AndroidBuildApkStep::showInGraphicalShell()
{ {
Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), FilePath::fromString(m_packagePath)); Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), m_packagePath);
} }
QWidget *AndroidBuildApkStep::createConfigWidget() QWidget *AndroidBuildApkStep::createConfigWidget()

3
src/plugins/android/androidbuildapkstep.h
View File

@@ -78,6 +78,7 @@ public:
void stdError(const QString &output) override; void stdError(const QString &output) override;
QVariant data(Utils::Id id) const override; QVariant data(Utils::Id id) const override;
private: private:
void showInGraphicalShell(); void showInGraphicalShell();
@@ -103,7 +104,7 @@ private:
QString m_keystorePasswd; QString m_keystorePasswd;
QString m_certificateAlias; QString m_certificateAlias;
QString m_certificatePasswd; QString m_certificatePasswd;
QString m_packagePath; Utils::FilePath m_packagePath;
QString m_command; QString m_command;
QString m_argumentsPasswordConcealed; QString m_argumentsPasswordConcealed;