From e8f2bc1f607c58d2bcf616451b923b05575e923c Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 30 Jul 2014 11:24:22 +0200 Subject: [PATCH] Android: Fix wrong return values Change-Id: Ia5917387c429278cac34a8d1f7a67631d491bff2 Reviewed-by: Daniel Teske --- src/plugins/android/androidsettingswidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 48fe21213fc..7243f99de5b 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -208,7 +208,7 @@ static QPair 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 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();