Commit 4d8d1d18 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Really stop the compiling of the puppet



Never rush some fixes. ;-(

Change-Id: I6c7bd21ebbb53630fc398540b8f7e28726ebd81e
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 43aa3902
......@@ -370,7 +370,10 @@ bool PuppetCreator::startBuildProcess(const QString &buildDirectoryPath,
process.setWorkingDirectory(buildDirectoryPath);
process.start(command, processArguments);
process.waitForStarted();
while (!progressDialog->useFallbackPuppet() && process.waitForReadyRead(-1)) {
while (process.waitForReadyRead(-1)) {
if (progressDialog->useFallbackPuppet())
return false;
QByteArray newOutput = process.readAllStandardOutput();
if (progressDialog)
progressDialog->newBuildOutput(newOutput);
......@@ -380,9 +383,7 @@ bool PuppetCreator::startBuildProcess(const QString &buildDirectoryPath,
process.waitForFinished();
if (process.exitStatus() == QProcess::NormalExit
&& process.exitCode() == 0
&& !progressDialog->useFallbackPuppet())
if (process.exitStatus() == QProcess::NormalExit && process.exitCode() == 0)
return true;
return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment