diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 16:20:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-27 13:54:35 +0200 |
| commit | 4dd8a63fc13cee365c58ef67fa4a4503aeceebe8 (patch) | |
| tree | c34de00e0bceeb70ed006e06a7fefc21537c72a1 /src/corelib/io/qprocess.cpp | |
| parent | 5757b8c516ad0d613739b222687583bca914a981 (diff) | |
| parent | fae33bfbe35f8d082b420ee09662ff60634cb355 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Conflicts:
src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
Manually fixed src/testlib/qtestcase.cpp to return the right type.
Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index ead04791e5c..1842541644e 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -2053,7 +2053,7 @@ QByteArray QProcess::readAllStandardError() printed at the console, and the existing process will continue running unaffected. - \sa pid(), started(), waitForStarted(), setNativeArguments() + \sa processId(), started(), waitForStarted(), setNativeArguments() */ void QProcess::start(const QString &program, const QStringList &arguments, OpenMode mode) { |