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

Use Utils::FilePath in SynchronousProcess

Browse Source 
Adapt callers and surrounding code.

Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-06-06 16:27:55 +02:00
parent 021d3a6c59
commit ca4ba34229
48 changed files with 202 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidrunnerworker.cpp
View File

@@ -63,6 +63,7 @@ static const int GdbTempFileMaxCounter = 20;
using namespace std;
using namespace std::placeholders;
using namespace ProjectExplorer;
using namespace Utils;
namespace Android {
namespace Internal {
@@ -126,10 +127,10 @@ static void findProcessPID(QFutureInterface<qint64> &fi, QStringList selector,
chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
do {
QThread::msleep(200);
QString adbPath = AndroidConfigurations::currentConfig().adbToolPath().toString();
FilePath adbPath = AndroidConfigurations::currentConfig().adbToolPath();
selector.append("shell");
selector.append(preNougat ? pidScriptPreNougat : pidScript.arg(packageName));
const auto out = Utils::SynchronousProcess().runBlocking(adbPath, selector).allRawOutput();
const auto out = SynchronousProcess().runBlocking({adbPath, selector}).allRawOutput();
if (preNougat) {
processPID = extractPID(out, packageName);
} else {