diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-03-05 14:42:11 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-03-06 13:38:38 +0100 |
| commit | 3dbfded87e76ab3497b8becfcc4174ff4c9703bd (patch) | |
| tree | 88fc018188e62c5f38e21f7daa5e450ef659e7c2 | |
| parent | d0911d0a92f47996fcba5520a8a91fe47e10f4a6 (diff) | |
Merge QProcess::startDetached(QString, QStringList, ...) overloads
Change-Id: Ic74f78c2bdf9acf0f91df3151e82cf2bf2602c1d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/io/qprocess.h | 9 |
2 files changed, 1 insertions, 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 @@ -2543,18 +2543,6 @@ bool QProcess::startDetached(const QString &program, } /*! - \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" |