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

Android M: Support new logcat output

Browse Source 
Change-Id: I64ae6493b45b3f1cac82e7f5e1ae77ec3b910bc9
Task-number: QTCREATORBUG-14534
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-06-12 15:36:04 +02:00
parent 1b0e5d787a
commit aff02184d4
6 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,8 @@ signals:
void remoteProcessStarted(int gdbServerPort, int qmlPort);
void remoteProcessFinished(const QString &errString = QString());
void remoteOutput(const QByteArray &output);
void remoteErrorOutput(const QByteArray &output);
void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output);
private slots:
void checkPID();
@@ -120,6 +120,7 @@ private:
bool m_isBusyBox;
QStringList m_selector;
QMutex m_mutex;
QRegExp m_logCatRegExp;
DebugHandShakeType m_handShakeMethod;
QTcpSocket *m_socket;
bool m_customPort;