diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 1b794286fa2..b7499e1ca2e 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1240,23 +1240,6 @@ void QtcProcess::close() d->m_process->close(); } -void QtcProcess::beginFeed() -{ - d->clearForRun(); -} - -void QtcProcess::endFeed() -{ - d->handleFinished(0, QProcess::NormalExit); -} - -void QtcProcess::feedStdOut(const QByteArray &data) -{ - d->m_stdOut.append(data); - d->m_hangTimerCount = 0; - emit readyReadStandardOutput(); -} - QString QtcProcess::locateBinary(const QString &binary) { const QByteArray path = qgetenv("PATH"); diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index f4d26ee88e9..cdcf116109c 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -210,11 +210,6 @@ private: friend class Internal::QtcProcessPrivate; Internal::QtcProcessPrivate *d = nullptr; - - friend tst_QtcProcess; - void beginFeed(); - void feedStdOut(const QByteArray &data); - void endFeed(); }; class DeviceProcessHooks diff --git a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp index 449b2e16b8f..1da9a30769a 100644 --- a/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/utils/qtcprocess/tst_qtcprocess.cpp @@ -150,7 +150,6 @@ private slots: void runBlockingStdOut_data(); void runBlockingStdOut(); void lineCallback(); - void lineCallbackIntern(); void waitForStartedAndFinished(); void notRunningAfterStartingNonExistingProgram(); void channelForwarding_data(); @@ -964,27 +963,6 @@ void tst_QtcProcess::lineCallback() QCOMPARE(lineNumber, lines.size()); } -void tst_QtcProcess::lineCallbackIntern() -{ - TestProcess process; - QStringList lines = QString(s_lineCallbackData).split('|'); - int lineNumber = 0; - process.setStdOutLineCallback([lines, &lineNumber](const QString &actual) { - QString expected = lines.at(lineNumber); - expected.replace("\r\n", "\n"); - // Omit some initial lines generated by Qt, e.g. - // Warning: Ignoring WAYLAND_DISPLAY on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway. - if (lineNumber == 0 && actual != expected) - return; - ++lineNumber; - QCOMPARE(actual, expected); - }); - process.beginFeed(); - process.feedStdOut(QByteArray(s_lineCallbackData).replace('|', "")); - process.endFeed(); - QCOMPARE(lineNumber, lines.size()); -} - void tst_QtcProcess::waitForStartedAndFinished() { SubProcessConfig subConfig(ProcessTestApp::SimpleTest::envVar(), {});