diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 45362d1ed71..0e3ce98907e 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1315,10 +1315,7 @@ static bool askToKill(const QString &command) // occurs on stderr/stdout as opposed to waitForFinished()). Returns false if a timeout // occurs. Checking of the process' exit state/code still has to be done. -bool QtcProcess::readDataFromProcess(int timeoutS, - QByteArray *stdOut, - QByteArray *stdErr, - bool showTimeOutMessageBox) +bool QtcProcess::readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr) { enum { syncDebug = 0 }; if (syncDebug) @@ -1351,7 +1348,7 @@ bool QtcProcess::readDataFromProcess(int timeoutS, } // Prompt user, pretend we have data if says 'No'. const bool hang = !hasData && !finished; - hasData = hang && showTimeOutMessageBox && !askToKill(d->m_setup.m_commandLine.executable().path()); + hasData = hang && !askToKill(d->m_setup.m_commandLine.executable().path()); } while (hasData && !finished); if (syncDebug) qDebug() << " &callback); void setStdErrLineCallback(const std::function &callback); - bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr, - bool showTimeOutMessageBox); + bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr); ProcessResult result() const; void setResult(const ProcessResult &result); diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index e43654d4c8d..d720260bca5 100644 --- a/src/plugins/android/androidqmlpreviewworker.cpp +++ b/src/plugins/android/androidqmlpreviewworker.cpp @@ -362,7 +362,7 @@ FilePath AndroidQmlPreviewWorker::createQmlrcFile(const FilePath &workFolder, } QByteArray stdOut; QByteArray stdErr; - if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { + if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) { rccProcess.stop(); rccProcess.waitForFinished(); appendMessage(tr("A timeout occurred running \"%1\""). diff --git a/src/plugins/coreplugin/patchtool.cpp b/src/plugins/coreplugin/patchtool.cpp index d26fcba6c08..2bb8b72df4c 100644 --- a/src/plugins/coreplugin/patchtool.cpp +++ b/src/plugins/coreplugin/patchtool.cpp @@ -111,7 +111,7 @@ static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirec QByteArray stdOut; QByteArray stdErr; - if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { + if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr)) { patchProcess.stop(); patchProcess.waitForFinished(); MessageManager::writeFlashing( diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 84ecf557214..cbdcc154285 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1328,7 +1328,7 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const FilePath & QByteArray stdOut; QByteArray stdErr; const int timeOutS = (flags & LongTimeOut) ? m_settings.longTimeOutS() : m_settings.timeOutS.value(); - if (!process.readDataFromProcess(timeOutS, &stdOut, &stdErr, true)) { + if (!process.readDataFromProcess(timeOutS, &stdOut, &stdErr)) { process.stop(); process.waitForFinished(); response.error = true; diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index 2233538196f..f8145b2a54a 100644 --- a/src/plugins/qmldesigner/generateresource.cpp +++ b/src/plugins/qmldesigner/generateresource.cpp @@ -254,7 +254,7 @@ void GenerateResource::generateMenuEntry(QObject *parent) } QByteArray stdOut; QByteArray stdErr; - if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { + if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) { Core::MessageManager::writeDisrupting( QCoreApplication::translate("QmlDesigner::GenerateResource", "A timeout occurred running \"%1\"") @@ -413,7 +413,7 @@ void GenerateResource::generateMenuEntry(QObject *parent) } QByteArray stdOut; QByteArray stdErr; - if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { + if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) { Core::MessageManager::writeDisrupting( QCoreApplication::translate("QmlDesigner::GenerateResource", "A timeout occurred running \"%1\"") @@ -542,7 +542,7 @@ void GenerateResource::generateMenuEntry(QObject *parent) } QByteArray stdOut; QByteArray stdErr; - if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr, true)) { + if (!rccProcess.readDataFromProcess(30, &stdOut, &stdErr)) { Core::MessageManager::writeDisrupting( QCoreApplication::translate("QmlDesigner::GenerateResource", "A timeout occurred running \"%1\"")