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

Starting AVD in run step. Before this change AVD was started only in deploy step.

Browse Source 
Task-number: QTCREATORBUG-10237
Change-Id: Ic99cc84013e53ddc60ed05c7983e141ecfc75169
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2016-06-08 16:57:32 +02:00
committed by Vikas Pachdha
parent 602f8e72be
commit 148d7636f1
2 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidrunner.h
View File

@@ -31,6 +31,7 @@
#include <projectexplorer/runconfiguration.h>
#include <qmldebug/qmldebugcommandlinearguments.h>
#include <QFutureInterface>
#include <QObject>
#include <QTimer>
#include <QTcpSocket>
@@ -80,15 +81,19 @@ private:
void logcatReadStandardOutput();
void asyncStart();
Q_INVOKABLE QByteArray runPs();
Q_INVOKABLE void launchAVDProcesses();
void adbKill(qint64 pid);
QStringList selector() const { return m_selector; }
void forceStop();
void findPs();
void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
bool adbShellAmNeedsQuotes();
void launchAVD();
bool runAdb(const QStringList &args, QString *errorMessage = nullptr, int timeoutS = 10);
private:
AndroidRunConfiguration *m_runConfig;
QString m_launchedAVDName;
QFutureInterface<bool> m_avdFutureInterface;
QProcess m_adbLogcatProcess;
QProcess m_psProc;
QTimer m_checkPIDTimer;