summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qprocess.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-05-07 14:22:30 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-23 11:39:25 +0200
commitcf4d0a64e9909ff3c989a77f5d297dadc76e58e2 (patch)
treec6de10e67fe8128ee2ceadafe4d3d93060330100 /src/corelib/io/qprocess.h
parent8f8d3aa4e8947cdfc3e04cd5cd62eee152cbbcd2 (diff)
fix and de-duplicate qprocess apidocs
- rectify confusion and outright disinformation about argument quoting - say that open() is an alias for start(), not the other way round, as this is more consistent - apply some trickery to hide mergeable startDetached() overload - rename program -> command where it stands for a joined command line, for consistency - copy less information to the various overloads - misc language fixes and reshuffling Change-Id: I1b9c8dbed003f551ee6855044bbfc0aedddb4757 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/corelib/io/qprocess.h')
-rw-r--r--src/corelib/io/qprocess.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 6be267f15f..94359acf00 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -209,12 +209,18 @@ public:
bool atEnd() const;
static int execute(const QString &program, const QStringList &arguments);
- static int execute(const QString &program);
+ static int execute(const QString &command);
- static bool startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory,
- qint64 *pid = 0);
- static bool startDetached(const QString &program, const QStringList &arguments);
- static bool startDetached(const QString &program);
+ static bool startDetached(const QString &program, const QStringList &arguments,
+ const QString &workingDirectory
+#if defined(Q_QDOC)
+ = QString()
+#endif
+ , qint64 *pid = 0);
+#if !defined(Q_QDOC)
+ static bool startDetached(const QString &program, const QStringList &arguments); // ### Qt6: merge overloads
+#endif
+ static bool startDetached(const QString &command);
static QStringList systemEnvironment();