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

Android: Increase timeouts for keytool

Browse Source 
Such a long timeout isn't nice since this is run in the gui thread.
But better than failing and typically it shouldn't need to block for
4s.

Task-number: QTCREATORBUG-10944
Change-Id: I1d3f842de8119603fa165878a14afc96a04c0c2a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2013-12-10 12:58:10 +01:00
parent 7bccc61f5e
commit 6f01f73b86
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidmanager.cpp
View File

@@ -1264,9 +1264,9 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
<< keystorePasswd; << keystorePasswd;
QProcess proc; QProcess proc;
proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments); proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments);
if (!proc.waitForStarted(500)) if (!proc.waitForStarted(4000))
return false; return false;
if (!proc.waitForFinished(500)) { if (!proc.waitForFinished(4000)) {
proc.kill(); proc.kill();
proc.waitForFinished(); proc.waitForFinished();
return false; return false;
@@ -1293,9 +1293,9 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
QProcess proc; QProcess proc;
proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments); proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments);
if (!proc.waitForStarted(500)) if (!proc.waitForStarted(4000))
return false; return false;
if (!proc.waitForFinished(500)) { if (!proc.waitForFinished(4000)) {
proc.kill(); proc.kill();
proc.waitForFinished(); proc.waitForFinished();
return false; return false;