From 3dbfded87e76ab3497b8becfcc4174ff4c9703bd Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 5 Mar 2020 14:42:11 +0100 Subject: Merge QProcess::startDetached(QString, QStringList, ...) overloads Change-Id: Ic74f78c2bdf9acf0f91df3151e82cf2bf2602c1d Reviewed-by: Volker Hilsheimer --- src/corelib/io/qprocess.cpp | 12 ------------ src/corelib/io/qprocess.h | 9 +-------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 73e192fa3e..40448b17ff 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -2542,18 +2542,6 @@ bool QProcess::startDetached(const QString &program, 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 \overload startDetached() diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index fe11aa2ec6..59b70c9175 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -263,14 +263,7 @@ public: static int execute(const QString &command); #endif static bool startDetached(const QString &program, const QStringList &arguments, - const QString &workingDirectory -#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 + const QString &workingDirectory = QString(), qint64 *pid = nullptr); #if QT_DEPRECATED_SINCE(5, 15) QT_DEPRECATED_X( "Use QProcess::startDetached(const QString &program, const QStringList &arguments) instead" -- cgit v1.2.3