From 6f01f73b86294a9b1cfe9f4423668760b2c2f242 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 10 Dec 2013 12:58:10 +0100 Subject: [PATCH] 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: Eike Ziller --- src/plugins/android/androidmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 73a713372ce..712933a627c 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -1264,9 +1264,9 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS << keystorePasswd; QProcess proc; proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments); - if (!proc.waitForStarted(500)) + if (!proc.waitForStarted(4000)) return false; - if (!proc.waitForFinished(500)) { + if (!proc.waitForFinished(4000)) { proc.kill(); proc.waitForFinished(); return false; @@ -1293,9 +1293,9 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const QProcess proc; proc.start(AndroidConfigurations::instance().keytoolPath().toString(), arguments); - if (!proc.waitForStarted(500)) + if (!proc.waitForStarted(4000)) return false; - if (!proc.waitForFinished(500)) { + if (!proc.waitForFinished(4000)) { proc.kill(); proc.waitForFinished(); return false;