diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-05 08:32:25 (GMT) |
| commit | 42318a57e95a875b2168ca027679d9258fcc929b (patch) | |
| tree | 88217a1a9df26fc0ec7f4af83607c727c9944b38 /src/corelib/io/qprocess.cpp | |
| parent | 09f07b98dfdaec2e48749768b967a48e588d3f7f (diff) | |
| parent | 739d4460d28d0ebcde4e5960f533c2a7554049f6 (diff) | |
| download | Qt-42318a57e95a875b2168ca027679d9258fcc929b.zip Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.gz Qt-42318a57e95a875b2168ca027679d9258fcc929b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index b5e7a97..8eba2b0 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1856,7 +1856,7 @@ QByteArray QProcess::readAllStandardError() } /*! - Starts the program \a program in a new process, if one is not already + Starts the given \a program in a new process, if none is already running, passing the command line arguments in \a arguments. The OpenMode is set to \a mode. @@ -1866,14 +1866,13 @@ QByteArray QProcess::readAllStandardError() process, a warning may be printed at the console, and the existing 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. + \note No further splitting of the arguments is performed. + \bold{Windows:} Arguments that contain spaces are wrapped in quotes. \sa pid(), started(), waitForStarted() @@ -2079,7 +2078,7 @@ QProcess::ExitStatus QProcess::exitStatus() const code of the process. Any data the new process writes to the console is forwarded to the calling process. - The environment and working directory are inherited by the calling + The environment and working directory are inherited from the calling process. On Windows, arguments that contain spaces are wrapped in quotes. |