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

Don't show wait cursor when doing lots of fast operations

Browse Source 
Change-Id: I430530d78cadb09a2445ad146a7c644414e64587
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
BogDan Vatra
2016-06-10 13:33:40 +03:00
parent bf3c3d4ff8
commit 26dd602785
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidconfigurations.cpp
View File

@@ -154,7 +154,7 @@ namespace {
SynchronousProcess proc; SynchronousProcess proc;
proc.setProcessChannelMode(QProcess::MergedChannels); proc.setProcessChannelMode(QProcess::MergedChannels);
proc.setTimeoutS(30); proc.setTimeoutS(30);
SynchronousProcessResponse response = proc.run(executable, QStringList() << shell); SynchronousProcessResponse response = proc.runBlocking(executable, QStringList() << shell);
if (response.result != SynchronousProcessResponse::Finished) if (response.result != SynchronousProcessResponse::Finished)
return true; return true;
return !response.allOutput().contains("x86-64"); return !response.allOutput().contains("x86-64");
@@ -545,7 +545,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const QString &adbToo
SynchronousProcess adbProc; SynchronousProcess adbProc;
adbProc.setTimeoutS(30); adbProc.setTimeoutS(30);
SynchronousProcessResponse response SynchronousProcessResponse response
= adbProc.run(adbToolPath, QStringList() << QLatin1String("devices")); = adbProc.runBlocking(adbToolPath, QStringList() << QLatin1String("devices"));
if (response.result != SynchronousProcessResponse::Finished) { if (response.result != SynchronousProcessResponse::Finished) {
if (error) if (error)
*error = QApplication::translate("AndroidConfiguration", *error = QApplication::translate("AndroidConfiguration",
@@ -862,7 +862,7 @@ bool AndroidConfig::isBootToQt(const QString &adbToolPath, const QString &device
SynchronousProcess adbProc; SynchronousProcess adbProc;
adbProc.setTimeoutS(10); adbProc.setTimeoutS(10);
SynchronousProcessResponse response = adbProc.run(adbToolPath, arguments); SynchronousProcessResponse response = adbProc.runBlocking(adbToolPath, arguments);
return response.result == SynchronousProcessResponse::Finished return response.result == SynchronousProcessResponse::Finished
&& response.allOutput().contains(QLatin1String("Boot2Qt")); && response.allOutput().contains(QLatin1String("Boot2Qt"));
} }
@@ -976,7 +976,7 @@ bool AndroidConfig::hasFinishedBooting(const QString &device) const
SynchronousProcess adbProc; SynchronousProcess adbProc;
adbProc.setTimeoutS(10); adbProc.setTimeoutS(10);
SynchronousProcessResponse response = adbProc.run(adbToolPath().toString(), arguments); SynchronousProcessResponse response = adbProc.runBlocking(adbToolPath().toString(), arguments);
if (response.result != SynchronousProcessResponse::Finished) if (response.result != SynchronousProcessResponse::Finished)
return false; return false;
QString value = response.allOutput().trimmed(); QString value = response.allOutput().trimmed();
@@ -996,7 +996,7 @@ QStringList AndroidConfig::getAbis(const QString &adbToolPath, const QString &de
arguments << QLatin1String("shell") << QLatin1String("getprop") << QLatin1String("ro.product.cpu.abilist"); arguments << QLatin1String("shell") << QLatin1String("getprop") << QLatin1String("ro.product.cpu.abilist");
SynchronousProcess adbProc; SynchronousProcess adbProc;
adbProc.setTimeoutS(10); adbProc.setTimeoutS(10);
SynchronousProcessResponse response = adbProc.run(adbToolPath, arguments); SynchronousProcessResponse response = adbProc.runBlocking(adbToolPath, arguments);
if (response.result != SynchronousProcessResponse::Finished) if (response.result != SynchronousProcessResponse::Finished)
return result; return result;
@@ -1018,7 +1018,7 @@ QStringList AndroidConfig::getAbis(const QString &adbToolPath, const QString &de
SynchronousProcess abiProc; SynchronousProcess abiProc;
abiProc.setTimeoutS(10); abiProc.setTimeoutS(10);
SynchronousProcessResponse abiResponse = abiProc.run(adbToolPath, arguments); SynchronousProcessResponse abiResponse = abiProc.runBlocking(adbToolPath, arguments);
if (abiResponse.result != SynchronousProcessResponse::Finished) if (abiResponse.result != SynchronousProcessResponse::Finished)
return result; return result;

2
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -76,7 +76,7 @@ static QByteArray runGcc(const FileName &gcc, const QStringList &arguments, cons
cpp.setEnvironment(environment); cpp.setEnvironment(environment);
cpp.setTimeoutS(10); cpp.setTimeoutS(10);
SynchronousProcessResponse response = cpp.run(gcc.toString(), arguments); SynchronousProcessResponse response = cpp.runBlocking(gcc.toString(), arguments);
if (response.result != SynchronousProcessResponse::Finished || if (response.result != SynchronousProcessResponse::Finished ||
response.exitCode != 0) { response.exitCode != 0) {
qWarning() << response.exitMessage(gcc.toString(), 10); qWarning() << response.exitMessage(gcc.toString(), 10);