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

Maemo: Fix displaying error output during deployment.

Browse Source
This commit is contained in:
Christian Kandeler
2011-04-07 12:15:25 +02:00
parent 17740d2ec3
commit 408763b43c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -979,10 +979,12 @@ void MaemoDeployStep::handleDeviceInstallerOutput(const QByteArray &output)
void MaemoDeployStep::handleDeviceInstallerErrorOutput(const QByteArray &output) void MaemoDeployStep::handleDeviceInstallerErrorOutput(const QByteArray &output)
{ {
ASSERT_STATE(QList<State>() << InstallingToDevice << StopRequested); ASSERT_STATE(QList<State>() << InstallingToDevice << CopyingFile
<< StopRequested);
switch (m_state) { switch (m_state) {
case InstallingToDevice: case InstallingToDevice:
case CopyingFile:
case StopRequested: case StopRequested:
m_installerStderr += output; m_installerStderr += output;
writeOutput(QString::fromUtf8(output), ErrorOutput); writeOutput(QString::fromUtf8(output), ErrorOutput);