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

Android: Small cleanup in AndroidQmlPreviewWorker

Browse Source 
Change-Id: I56933f1dd327b233082e1f8ac81e0e7f3d19694b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2024-05-15 18:50:23 +02:00
parent 28308b016b
commit 8b7b389fb4
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/android/androidqmlpreviewworker.cpp
View File

@@ -42,7 +42,17 @@ namespace Android::Internal {
class ApkInfo class ApkInfo
{ {
public: public:
ApkInfo(); ApkInfo()
: abis{ProjectExplorer::Constants::ANDROID_ABI_X86,
ProjectExplorer::Constants::ANDROID_ABI_X86_64,
ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A}
, appId(APP_ID)
, uploadDir("/data/local/tmp/" APP_ID "/")
// TODO Add possibility to run Qt5 built version of Qt Design Viewer
, activityId(APP_ID "/org.qtproject.qt.android.bindings.QtActivity")
, name("Qt Design Viewer")
{}
const QStringList abis; const QStringList abis;
const QString appId; const QString appId;
const QString uploadDir; const QString uploadDir;
@@ -50,18 +60,6 @@ public:
const QString name; const QString name;
}; };
ApkInfo::ApkInfo() :
abis({ProjectExplorer::Constants::ANDROID_ABI_X86,
ProjectExplorer::Constants::ANDROID_ABI_X86_64,
ProjectExplorer::Constants::ANDROID_ABI_ARM64_V8A,
ProjectExplorer::Constants::ANDROID_ABI_ARMEABI_V7A}),
appId(APP_ID),
uploadDir("/data/local/tmp/" APP_ID "/"),
// TODO Add possibility to run Qt5 built version of Qt Design Viewer
activityId(APP_ID "/org.qtproject.qt.android.bindings.QtActivity"),
name("Qt Design Viewer")
{
}
Q_GLOBAL_STATIC(ApkInfo, apkInfo) Q_GLOBAL_STATIC(ApkInfo, apkInfo)
@@ -103,15 +101,15 @@ private:
bool startPreviewApp(); bool startPreviewApp();
bool stopPreviewApp(); bool stopPreviewApp();
Utils::FilePath designViewerApkPath(const QString &abi) const; FilePath designViewerApkPath(const QString &abi) const;
Utils::FilePath createQmlrcFile(const Utils::FilePath &workFolder, const QString &basename); FilePath createQmlrcFile(const FilePath &workFolder, const QString &basename);
RunControl *m_rc = nullptr; RunControl *m_rc = nullptr;
QString m_serialNumber; QString m_serialNumber;
QStringList m_avdAbis; QStringList m_avdAbis;
int m_viewerPid = -1; int m_viewerPid = -1;
TaskTreeRunner m_pidRunner; TaskTreeRunner m_pidRunner;
Utils::Process m_logcatProcess; Process m_logcatProcess;
QString m_logcatStartTimeStamp; QString m_logcatStartTimeStamp;
UploadInfo m_uploadInfo; UploadInfo m_uploadInfo;
}; };