diff options
Diffstat (limited to 'src/corelib/io/qprocess.h')
| -rw-r--r-- | src/corelib/io/qprocess.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 8c55080252..ee83c93cf8 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -248,12 +248,9 @@ public: QProcess::ExitStatus exitStatus() const; // QIODevice - qint64 bytesAvailable() const override; // ### Qt6: remove trivial override qint64 bytesToWrite() const override; bool isSequential() const override; - bool canReadLine() const override; // ### Qt6: remove trivial override void close() override; - bool atEnd() const override; // ### Qt6: remove trivial override static int execute(const QString &program, const QStringList &arguments); #if QT_DEPRECATED_SINCE(5, 15) @@ -263,14 +260,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" @@ -290,11 +280,7 @@ public Q_SLOTS: Q_SIGNALS: void started(QPrivateSignal); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_X("Use QProcess::finished(int, QProcess::ExitStatus) instead") - void finished(int exitCode); // ### Qt 6: merge the two signals with a default value -#endif - void finished(int exitCode, QProcess::ExitStatus exitStatus); + void finished(int exitCode, QProcess::ExitStatus exitStatus = NormalExit); #if QT_DEPRECATED_SINCE(5, 6) QT_DEPRECATED_X("Use QProcess::errorOccurred(QProcess::ProcessError) instead") void error(QProcess::ProcessError error); |