Android: Use Qt5-style connects

The heavy lifting was done by clazy.

Change-Id: Id09b62b7b9812d9c0981202c257d18387a8b09d9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Orgad Shaneh
2016-06-26 22:52:59 +03:00
committed by Orgad Shaneh
parent c3acbc46ed
commit 88dfa84fc6
40 changed files with 243 additions and 418 deletions

View File

@@ -61,7 +61,7 @@ public:
void setRunnable(const AndroidRunnable &runnable);
const AndroidRunnable &runnable() const { return m_androidRunnable; }
public slots:
public:
void start();
void stop();
void handleRemoteDebuggerRunning();
@@ -74,14 +74,13 @@ signals:
void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output);
private slots:
private:
void checkPID();
void logcatReadStandardError();
void logcatReadStandardOutput();
void asyncStart();
QByteArray runPs();
Q_INVOKABLE QByteArray runPs();
private:
void adbKill(qint64 pid);
QStringList selector() const { return m_selector; }
void forceStop();
@@ -89,7 +88,6 @@ private:
void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
bool adbShellAmNeedsQuotes();
private:
bool runAdb(const QStringList &args, QString *errorMessage = nullptr, int timeoutS = 10);
QProcess m_adbLogcatProcess;
QProcess m_psProc;