Commit ca23a291 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Christian Stenger

Android: Fix compilation with Qt 4.

Change-Id: I2a25cbb19246526702c91b41e3e62f05f7833e87
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent ac039f96
......@@ -208,7 +208,7 @@ static QPair<QStringList, bool> checkGdbForBrokenPython(const QStringList &paths
if (output.contains("(gdb)"))
break;
if (timer.elapsed() > 7 * 1000)
return qMakePair(path, true); // Took too long, abort
return qMakePair(QStringList(path), true); // Took too long, abort
}
output.clear();
......@@ -219,7 +219,7 @@ static QPair<QStringList, bool> checkGdbForBrokenPython(const QStringList &paths
proc.write("quit\n");
while (proc.waitForFinished(300)) {
if (timer.elapsed() > 9 * 1000)
return qMakePair(path, true); // Took too long, abort
return qMakePair(QStringList(path), true); // Took too long, abort
}
proc.waitForFinished();
......
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