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

Utils: Drop Utils::SkipEmptyParts again

Browse Source 
We require Qt 5.14 nowadays.

Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-21 10:19:36 +02:00
parent c41847ce5d
commit 43b658e9e7
67 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,7 +600,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
.arg(cmd.toUserOutput());
return devices;
}
QStringList adbDevs = response.allOutput().split('\n', Utils::SkipEmptyParts);
QStringList adbDevs = response.allOutput().split('\n', Qt::SkipEmptyParts);
if (adbDevs.empty())
return devices;

2
src/plugins/android/androidmanager.cpp
View File

@@ -146,7 +146,7 @@ bool AndroidManager::packageInstalled(const QString &deviceSerial,
QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial);
args << "shell" << "pm" << "list" << "packages";
QStringList lines = runAdbCommand(args).stdOut().split(QRegularExpression("[\\n\\r]"),
Utils::SkipEmptyParts);
Qt::SkipEmptyParts);
for (const QString &line : lines) {
// Don't want to confuse com.abc.xyz with com.abc.xyz.def so check with
// endsWith

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

@@ -510,7 +510,7 @@ void AndroidRunnerWorker::asyncStartHelper()
}
for (const QString &entry : m_beforeStartAdbCommands)
runAdb(entry.split(' ', Utils::SkipEmptyParts));
runAdb(entry.split(' ', Qt::SkipEmptyParts));
QStringList args({"shell", "am", "start"});
args << m_amStartExtraArgs;
@@ -800,7 +800,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
// Run adb commands after application quit.
for (const QString &entry: m_afterFinishAdbCommands)
runAdb(entry.split(' ', Utils::SkipEmptyParts));
runAdb(entry.split(' ', Qt::SkipEmptyParts));
} else {
// In debugging cases this will be funneled to the engine to actually start
// and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below.

2
src/plugins/android/androidsdkmanager.cpp
View File

@@ -105,7 +105,7 @@ int parseProgress(const QString &out, bool &foundAssertion)
if (out.isEmpty())
return progress;
QRegularExpression reg("(?<progress>\\d*)%");
QStringList lines = out.split(QRegularExpression("[\\n\\r]"), Utils::SkipEmptyParts);
QStringList lines = out.split(QRegularExpression("[\\n\\r]"), Qt::SkipEmptyParts);
for (const QString &line : lines) {
QRegularExpressionMatch match = reg.match(line);
if (match.hasMatch()) {