diff options
author | Daniel Teske <daniel.teske@digia.com> | 2014-07-30 11:24:22 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2014-07-30 11:26:16 +0200 |
commit | e8f2bc1f607c58d2bcf616451b923b05575e923c (patch) | |
tree | 4bd14609e664308820c2bcb71286de419512f043 | |
parent | 882eb4f33571e3cacb7f0e2c6830c84ff79db212 (diff) |
Android: Fix wrong return values
Change-Id: Ia5917387c429278cac34a8d1f7a67631d491bff2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
-rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 48fe21213f..7243f99de5 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -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(); |