1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge QProcess::startDetached(QString, QStringList, ...) overloads

Browse Source 
Change-Id: Ic74f78c2bdf9acf0f91df3151e82cf2bf2602c1d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Joerg Bornemann 2020-03-05 14:42:11 +01:00
parent d0911d0a92
commit 3dbfded87e
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qprocess.cpp
View File

@ -2542,18 +2542,6 @@ bool QProcess::startDetached(const QString &program,
return process.startDetached(pid); return process.startDetached(pid);
} }
/*!
\internal
*/
bool QProcess::startDetached(const QString &program,
const QStringList &arguments)
{
QProcess process;
process.setProgram(program);
process.setArguments(arguments);
return process.startDetached();
}
/*! /*!
\obsolete \obsolete
\overload startDetached() \overload startDetached()

9
src/corelib/io/qprocess.h
View File

@ -263,14 +263,7 @@ public:
static int execute(const QString &command); static int execute(const QString &command);
#endif #endif
static bool startDetached(const QString &program, const QStringList &arguments, static bool startDetached(const QString &program, const QStringList &arguments,
const QString &workingDirectory const QString &workingDirectory = QString(), qint64 *pid = nullptr);
#if defined(Q_QDOC)
= QString()
#endif
, qint64 *pid = nullptr);
#if !defined(Q_QDOC)
static bool startDetached(const QString &program, const QStringList &arguments); // ### Qt6: merge overloads
#endif
#if QT_DEPRECATED_SINCE(5, 15) #if QT_DEPRECATED_SINCE(5, 15)
QT_DEPRECATED_X( QT_DEPRECATED_X(
"Use QProcess::startDetached(const QString &program, const QStringList &arguments) instead" "Use QProcess::startDetached(const QString &program, const QStringList &arguments) instead"