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

Android: Properly split stderr into lines and drop unrelated messages

Browse Source 
Change-Id: I860cddcea23692fd8c9b69b849e7b1fb50e9113d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ulf Hermann
2014-03-13 17:33:47 +01:00
parent ffbb129f18
commit f9864efea7
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ private:
void forceStop();
QByteArray runPs();
void findPs();
void logcatProcess(const QByteArray &text, QByteArray &buffer, bool onlyError);
private:
QProcess m_adbLogcatProcess;
@@ -89,7 +90,8 @@ private:
bool m_wasStarted;
int m_tries;
QByteArray m_logcat;
QByteArray m_stdoutBuffer;
QByteArray m_stderrBuffer;
QString m_intentName;
QString m_packageName;
QString m_deviceSerialNumber;