diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
| commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
| tree | 98d321520f31107067ca45e5b5806d92551b2f3d /src/plugins/android/androidrunner.h | |
| parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
| parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
| download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'src/plugins/android/androidrunner.h')
| -rw-r--r-- | src/plugins/android/androidrunner.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index b18aee29d2..a42034b557 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -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; |