diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 0e3ce98907e..0f3764e35cc 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1315,7 +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 QtcProcess::readDataFromProcess(QByteArray *stdOut, QByteArray *stdErr, int timeoutS) { enum { syncDebug = 0 }; if (syncDebug) diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 28d17bbc0f0..0070c47414d 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -175,7 +175,7 @@ public: void setStdErrCallback(const std::function &callback); void setStdErrLineCallback(const std::function &callback); - bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr); + bool readDataFromProcess(QByteArray *stdOut, QByteArray *stdErr, int timeoutS = 30); ProcessResult result() const; void setResult(const ProcessResult &result); diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index d720260bca5..7de47b90139 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)) { + if (!rccProcess.readDataFromProcess(&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 2bb8b72df4c..655298cc9a4 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)) { + if (!patchProcess.readDataFromProcess(&stdOut, &stdErr)) { patchProcess.stop(); patchProcess.waitForFinished(); MessageManager::writeFlashing( diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index cbdcc154285..67a801eca42 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)) { + if (!process.readDataFromProcess(&stdOut, &stdErr, timeOutS)) { process.stop(); process.waitForFinished(); response.error = true; diff --git a/src/plugins/qmldesigner/generateresource.cpp b/src/plugins/qmldesigner/generateresource.cpp index f8145b2a54a..376886a1284 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)) { + if (!rccProcess.readDataFromProcess(&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)) { + if (!rccProcess.readDataFromProcess(&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)) { + if (!rccProcess.readDataFromProcess(&stdOut, &stdErr)) { Core::MessageManager::writeDisrupting( QCoreApplication::translate("QmlDesigner::GenerateResource", "A timeout occurred running \"%1\"")