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

Android: Fix wrong return values

Browse Source 
Change-Id: Ia5917387c429278cac34a8d1f7a67631d491bff2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2014-07-30 11:24:22 +02:00
parent 882eb4f335
commit e8f2bc1f60
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidsettingswidget.cpp
View File

@@ -208,7 +208,7 @@ static QPair<QStringList, bool> checkGdbForBrokenPython(const QStringList &paths
if (output.contains("(gdb)"))
break;
if (timer.elapsed() > 7 * 1000)
return qMakePair(QStringList(path), true); // Took too long, abort
return qMakePair(paths, 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(QStringList(path), true); // Took too long, abort
return qMakePair(paths, true); // Took too long, abort
}
proc.waitForFinished();