diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-22 14:17:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-23 11:23:36 +0200 |
| commit | c5a3e5edd9e63b18abf1838c86a27a662224b02c (patch) | |
| tree | 9a367c113d9b586da73439cb100744d616ce6399 /src/corelib/io/qprocess.cpp | |
| parent | 3312ac91692c3a4a033d123eecbf982d3ff10471 (diff) | |
| parent | a5df2e7120412dfdedb9f4951cdb061c0f218bf7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp
Conflicts:
src/corelib/global/qglobal.h
src/corelib/tools/qcollator_macx.cpp
src/corelib/tools/qstring.cpp
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindow_p.h
src/gui/text/qtextengine.cpp
src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
src/plugins/platforms/android/qandroidinputcontext.cpp
src/plugins/platforms/xcb/qglxintegration.cpp
src/plugins/platforms/xcb/qglxintegration.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/testlib/qtestcase.cpp
src/testlib/qtestlog.cpp
src/widgets/dialogs/qfiledialog.cpp
src/widgets/kernel/qwindowcontainer.cpp
tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index b03e96d0f6..66036fca90 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1689,8 +1689,8 @@ void QProcess::setEnvironment(const QStringList &environment) \deprecated Returns the environment that QProcess will use when starting a process, or an empty QStringList if no environment has been set - using setEnvironment() or setEnvironmentHash(). If no environment - has been set, the environment of the calling process will be used. + using setEnvironment(). If no environment has been set, the + environment of the calling process will be used. \note The environment settings are ignored on Windows CE, as there is no concept of an environment. @@ -2016,7 +2016,7 @@ QByteArray QProcess::readAllStandardError() \note No further splitting of the arguments is performed. \b{Windows:} The arguments are quoted and joined into a command line - that is compatible with the CommandLineToArgvW() Windows function. + that is compatible with the \c CommandLineToArgvW() Windows function. For programs that have different command line quoting requirements, you need to use setNativeArguments(). @@ -2320,8 +2320,8 @@ int QProcess::exitCode() const Returns the exit status of the last process that finished. - On Windows, if the process was terminated with TerminateProcess() - from another application this function will still return NormalExit + On Windows, if the process was terminated with TerminateProcess() from + another application, this function will still return NormalExit unless the exit code is less than 0. */ QProcess::ExitStatus QProcess::exitStatus() const |