diff options
author | ck <qt-info@nokia.com> | 2010-06-17 12:23:26 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-06-17 13:34:12 +0200 |
commit | d20bf7b510ede5d2739f662d7a5ac6ef31b6bf7e (patch) | |
tree | 83cc7772674c3a83c2f35bbac1a632c85c1001fa | |
parent | 66f04ed52af7f854640d1f9ba2a53a8737c0ef34 (diff) | |
download | qt-creator-d20bf7b510ede5d2739f662d7a5ac6ef31b6bf7e.tar.gz |
Maemo: Remove packaging timeout.
Reviewed-by: kh1
(cherry picked from commit cfdb5d7446e64086609c5943c7806762ed1bfbc4)
-rw-r--r-- | src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp index c43a2f1bea..43799f8097 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp @@ -233,11 +233,7 @@ bool MaemoPackageCreationStep::runCommand(QProcess &proc, const QString &command return false; } proc.write("\n"); // For dh_make - if (!proc.waitForFinished(60000) && proc.error() == QProcess::Timedout) { - raiseError(tr("Packaging failed."), - tr("Packaging Error: Command '%1' timed out.").arg(command)); - return false; - } + proc.waitForFinished(-1); if (proc.error() != QProcess::UnknownError || proc.exitCode() != 0) { QString mainMessage = tr("Packaging Error: Command '%1' failed.") .arg(command); |