feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use QProcess::kill() rather than QProcess::terminate() for adb.exe

Browse Source 
terminate (on Windows) requires a Windows Event Loop to process it
so use kill() on all platforms instead.

Change-Id: Ic38d6813c3071fde67806b10d782e5ab3b0f1a18
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Ray Donnelly
2012-12-10 23:43:21 +00:00
committed by Daniel Teske
parent 4e540ce786
commit decefcbd8f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -203,7 +203,7 @@ void AndroidPackageCreationStep::checkRequiredLibraries()
readelfProc.start(AndroidConfigurations::instance().readelfPath(target()->activeRunConfiguration()->abi().architecture()).toString(),
QStringList() << QLatin1String("-d") << QLatin1String("-W") << appPath);
if (!readelfProc.waitForFinished(-1)) {
readelfProc.terminate();
readelfProc.kill();
return;
}
QStringList libs;
@@ -250,7 +250,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
}
readelfProc.start(m_readElf.toString(), QStringList() << QLatin1String("-d") << QLatin1String("-W") << m_appPath.toUserOutput());
if (!readelfProc.waitForFinished(-1)) {
readelfProc.terminate();
readelfProc.kill();
return;
}
QStringList libs;
@@ -467,7 +467,7 @@ void AndroidPackageCreationStep::stripAndroidLibs(const QStringList & files, Abi
QStringList()<<QLatin1String("--strip-unneeded") << file);
stripProcess.waitForStarted();
if (!stripProcess.waitForFinished())
stripProcess.terminate();
stripProcess.kill();
}
}