comparison src/hgrunner.cpp @ 666:98a7fbbe9d88 qt5

Merge from default branch, and build fixes
author Chris Cannam
date Fri, 27 May 2016 09:55:56 +0100
parents f9b805d8cab4
children 4283398d248f
comparison
equal deleted inserted replaced
663:f9b805d8cab4 666:98a7fbbe9d88
409 << endl; 409 << endl;
410 // DEBUG << "stdout is " << m_stdout << endl; 410 // DEBUG << "stdout is " << m_stdout << endl;
411 emit commandCompleted(completedAction, m_stdout); 411 emit commandCompleted(completedAction, m_stdout);
412 } else { 412 } else {
413 DEBUG << "HgRunner::finished: Command failed, exit code " 413 DEBUG << "HgRunner::finished: Command failed, exit code "
414 << procExitCode << ", exit status " << procExitStatus 414 << procExitCode << ", exit status " << int(procExitStatus)
415 << ", stderr follows" << endl; 415 << ", stderr follows" << endl;
416 DEBUG << m_stderr << endl; 416 DEBUG << m_stderr << endl;
417 emit commandFailed(completedAction, m_stderr, m_stdout); 417 emit commandFailed(completedAction, m_stderr, m_stdout);
418 } 418 }
419 } 419 }