Changeset 211 for trunk/src

Timestamp:

Oct 7, 2009, 12:27:06 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: No need to create out/err pipes in ForwardedChannels mode.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (3 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -861 +861 @@
 
     // Initialize pipes
-    if (!createChannel(stdinChannel) ||
-        !createChannel(stdoutChannel) ||
-        !createChannel(stderrChannel))
+    if (!createChannel(stdinChannel))
         return;
+
+
+
+
 
     procKey = QProcessManager::addProcess(q);
@@ -936 +938 @@
                 break;
             }
-            // qDebug() uses STDERR so only redirect if !QPROCESS_DEBUG
-#if !defined (QPROCESS_DEBUG)
             if ((arc = DosDupHandle(realStderr, &tmpStderr)) == NO_ERROR) {
                 // merge stdout and stderr if asked to
@@ -943 +943 @@
                     arc = DosDupHandle(realStdout, &realStderr);
                 } else {
+
+
                     arc = DosDupHandle(stderrChannel.pipe.client, &realStderr);
+
                 }
             }
             if (arc != NO_ERROR)
                 break;
-#endif
         }