equal
deleted
inserted
replaced
96 |
96 |
97 childProc->setWorkingDirectory(m_workDir); |
97 childProc->setWorkingDirectory(m_workDir); |
98 connect(childProc, SIGNAL(finished(int)), this, SLOT(childReady(int))); |
98 connect(childProc, SIGNAL(finished(int)), this, SLOT(childReady(int))); |
99 childProc->setProcessChannelMode(QProcess::MergedChannels); |
99 childProc->setProcessChannelMode(QProcess::MergedChannels); |
100 if (argList.isEmpty()) { |
100 if (argList.isEmpty()) { |
101 childProc->start( program ); |
101 childProc->start( program, QIODevice::ReadWrite | QIODevice::Text ); |
102 } else { |
102 } else { |
103 childProc->start( program, argList ); |
103 childProc->start( program, argList, QIODevice::ReadWrite | QIODevice::Text ); |
104 } |
104 } |
105 bool ok; |
105 bool ok; |
106 |
106 |
107 ok = childProc->waitForStarted(); |
107 ok = childProc->waitForStarted(); |
108 |
108 |