Commit 6f01f73b authored by Daniel Teske's avatar Daniel Teske
Browse files

Android: Increase timeouts for keytool



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: default avatarEike Ziller <eike.ziller@digia.com>
parent 7bccc61f
...@@ -1264,9 +1264,9 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS ...@@ -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 ...@@ -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;
......
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