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

Android: Fix compilation with Qt 4.

Browse Source 
Change-Id: I2a25cbb19246526702c91b41e3e62f05f7833e87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Friedemann Kleint
2014-07-30 09:22:20 +02:00
committed by Christian Stenger
parent ac039f9655
commit ca23a29178
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)")) if (output.contains("(gdb)"))
break; break;
if (timer.elapsed() > 7 * 1000) if (timer.elapsed() > 7 * 1000)
return qMakePair(path, true); // Took too long, abort return qMakePair(QStringList(path), true); // Took too long, abort
} }
output.clear(); output.clear();
@@ -219,7 +219,7 @@ static QPair<QStringList, bool> checkGdbForBrokenPython(const QStringList &paths
proc.write("quit\n"); proc.write("quit\n");
while (proc.waitForFinished(300)) { while (proc.waitForFinished(300)) {
if (timer.elapsed() > 9 * 1000) if (timer.elapsed() > 9 * 1000)
return qMakePair(path, true); // Took too long, abort return qMakePair(QStringList(path), true); // Took too long, abort
} }
proc.waitForFinished(); proc.waitForFinished();