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

16
src/plugins/android/androidruncontrol.cpp
View File

@@ -60,10 +60,10 @@ void AndroidRunControl::start()
emit started();
disconnect(m_runner, 0, this, 0);
connect(m_runner, SIGNAL(remoteErrorOutput(QByteArray)),
SLOT(handleRemoteErrorOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteOutput(QByteArray)),
SLOT(handleRemoteOutput(QByteArray)));
connect(m_runner, SIGNAL(remoteErrorOutput(QString)),
SLOT(handleRemoteErrorOutput(QString)));
connect(m_runner, SIGNAL(remoteOutput(QString)),
SLOT(handleRemoteOutput(QString)));
connect(m_runner, SIGNAL(remoteProcessFinished(QString)),
SLOT(handleRemoteProcessFinished(QString)));
appendMessage(tr("Starting remote process."), Utils::NormalMessageFormat);
@@ -84,14 +84,14 @@ void AndroidRunControl::handleRemoteProcessFinished(const QString &error)
emit finished();
}
void AndroidRunControl::handleRemoteOutput(const QByteArray &output)
void AndroidRunControl::handleRemoteOutput(const QString &output)
{
appendMessage(QString::fromUtf8(output), Utils::StdOutFormatSameLine);
appendMessage(output, Utils::StdOutFormatSameLine);
}
void AndroidRunControl::handleRemoteErrorOutput(const QByteArray &output)
void AndroidRunControl::handleRemoteErrorOutput(const QString &output)
{
appendMessage(QString::fromUtf8(output), Utils::StdErrFormatSameLine);
appendMessage(output, Utils::StdErrFormatSameLine);
}
bool AndroidRunControl::isRunning() const