From 470724ad21d64f1e85bd4ec0a28d916ca37b21be Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 12 Aug 2021 12:08:08 +0200
Subject: [PATCH] Android: Use FilePath for AndroidBuildApkStep::m_packagePath

Change-Id: I7088d34f7931674f7638c5981d2b8c27e18335bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidbuildapkstep.cpp | 6 +++---
 src/plugins/android/androidbuildapkstep.h   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 3aaa87b0de5..465272e8e37 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -557,9 +557,9 @@ bool AndroidBuildApkStep::init()
                                                                       : QLatin1String("debug");
         m_packagePath = 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 {
-        m_packagePath = AndroidManager::apkPath(target()).toString();
+        m_packagePath = AndroidManager::apkPath(target());
     }
 
     qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath;
@@ -650,7 +650,7 @@ void AndroidBuildApkStep::setupOutputFormatter(OutputFormatter *formatter)
 
 void AndroidBuildApkStep::showInGraphicalShell()
 {
-    Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), FilePath::fromString(m_packagePath));
+    Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), m_packagePath);
 }
 
 QWidget *AndroidBuildApkStep::createConfigWidget()
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index f17703ab654..9cd89c641f7 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -78,6 +78,7 @@ public:
     void stdError(const QString &output) override;
 
     QVariant data(Utils::Id id) const override;
+
 private:
     void showInGraphicalShell();
 
@@ -103,7 +104,7 @@ private:
     QString m_keystorePasswd;
     QString m_certificateAlias;
     QString m_certificatePasswd;
-    QString m_packagePath;
+    Utils::FilePath m_packagePath;
 
     QString m_command;
     QString m_argumentsPasswordConcealed;