Changeset 846 for trunk/src/corelib/io/qprocess.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/io/qprocess.cpp (modified) (12 diffs)

trunk/src/corelib/io/qprocess.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -89 +89 @@
 
 #include <qbytearray.h>
-#include <qdatetime.h>
+#include <q.h>
 #include <qcoreapplication.h>
 #include <qsocketnotifier.h>
@@ -1393 +1393 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*!
     If QProcess has been assigned a working directory, this function returns
@@ -1665 +1709 @@
         return false;
     if (d->processState == QProcess::Starting) {
-        QTime stopWatch;
+        Q stopWatch;
         stopWatch.start();
         bool started = waitForStarted(msecs);
@@ -1702 +1746 @@
         return false;
     if (d->processState == QProcess::Starting) {
-        QTime stopWatch;
+        Q stopWatch;
         stopWatch.start();
         bool started = waitForStarted(msecs);
@@ -1880 +1924 @@
 
 /*!
-    Starts the program \a program in a new process, if one is not already
+    Starts the  already
     running, passing the command line arguments in \a arguments. The OpenMode
     is set to \a mode.
@@ -1890 +1934 @@
     process will continue running.
 
-    \note Arguments that contain spaces are not passed to the
-    process as separate arguments.
-
     \note Processes are started asynchronously, which means the started()
     and error() signals may be delayed. Call waitForStarted() to make
     sure the process has started (or has failed to start) and those signals
     have been emitted.
+
+
 
     \bold{Windows:} Arguments that contain spaces are wrapped in quotes.
@@ -2046 +2089 @@
     cause a panic in Symbian due to platform security.
 
-    \sa \l {Symbian Platform Security Requirements}
+    \sa {Symbian Platform Security Requirements}
     \sa kill()
 */
@@ -2064 +2107 @@
     \c PowerMgmt. If absent, the process will panic with KERN-EXEC 46.
 
-    \sa \l {Symbian Platform Security Requirements}
+    \sa {Symbian Platform Security Requirements}
     \sa terminate()
 */
@@ -2103 +2146 @@
     console is forwarded to the calling process.
 
-    The environment and working directory are inherited by the calling
+    The environment and working directory are inherited  the calling
     process.
 
     On Windows, arguments that contain spaces are wrapped in quotes.
+
+
+
+
 */
 int QProcess::execute(const QString &program, const QStringList &arguments)
@@ -2113 +2160 @@
     process.setReadChannelMode(ForwardedChannels);
     process.start(program, arguments);
-    process.waitForFinished(-1);
-    return process.exitCode();
+    if (!process.waitForFinished(-1))
+        return -2;
+    return process.exitStatus() == QProcess::NormalExit ? process.exitCode() : -1;
 }
 
@@ -2129 +2177 @@
     process.setReadChannelMode(ForwardedChannels);
     process.start(program);
-    process.waitForFinished(-1);
-    return process.exitCode();
+    if (!process.waitForFinished(-1))
+        return -2;
+    return process.exitStatus() == QProcess::NormalExit ? process.exitCode() : -1;
 }