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

Android: Make fixes to androidqmlpreview

Browse Source 
This amends 261a39cbbd with fixes
to issues noticed after merging the initial patch.

Change-Id: I5f859374cbba3a2e020e6ca0789cc2b387d2739a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia
2021-09-23 17:11:19 +03:00
parent b1d5abd8eb
commit b7c15d4d8d
2 changed files with 184 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/android/androidqmlpreviewworker.h
View File

@@ -25,9 +25,12 @@
#pragma once
#include "androidconfigurations.h"
#include <projectexplorer/runcontrol.h>
#include <utils/environment.h>
#include <QFutureWatcher>
namespace Android {
class SdkToolResult;
@@ -45,6 +48,10 @@ class AndroidQmlPreviewWorker : public ProjectExplorer::RunWorker
Q_OBJECT
public:
AndroidQmlPreviewWorker(ProjectExplorer::RunControl *runControl);
~AndroidQmlPreviewWorker();
signals:
void previewPidChanged();
private:
void start() override;
@@ -52,22 +59,33 @@ private:
bool ensureAvdIsRunning();
bool checkAndInstallPreviewApp();
bool prepareUpload(UploadInfo &transfer);
bool uploadFiles(const UploadInfo &transfer);
bool preparePreviewArtefacts();
bool uploadPreviewArtefacts();
bool runPreviewApp(const UploadInfo &transfer);
SdkToolResult runAdbCommand(const QStringList &arguments) const;
SdkToolResult runAdbShellCommand(const QStringList &arguments) const;
int pidofPreview() const;
bool isPreviewRunning(int lastKnownPid = -1) const;
void startPidWatcher();
void startLogcat();
void filterLogcatAndAppendMessage(const QString &stdOut);
bool startPreviewApp();
bool stopPreviewApp();
void startLogcat();
void appendLogLines(const QStringList &lines);
Utils::FilePath designViewerApkPath(const QString &abi) const;
Utils::FilePath createQmlrcFile(const Utils::FilePath &workFolder, const QString &basename);
ProjectExplorer::RunControl *m_rc = nullptr;
AndroidConfig m_config;
AndroidDeviceInfo m_devInfo;
AndroidConfig m_androidConfig;
QString m_serialNumber;
QStringList m_avdAbis;
int m_viewerPid = -1;
QFutureWatcher<void> m_pidFutureWatcher;
Utils::QtcProcess m_logcatProcess;
QString m_logcatStartTimeStamp;
UploadInfo m_uploadInfo;
};
} // namespace Internal