forked from qt-creator/qt-creator
Android: Fix compilation with clang-cl and Qt 6.4.0
Fixes the following error:
C:\Projects\QtCreator\repo\src\plugins\android\androidrunnerworker.cpp(74,54): error: call to member function 'remove' is ambiguous
const QStringList parts = tuple.simplified().remove('\0').split(':');
~~~~~~~~~~~~~~~~~~~^~~~~~
C:\Qt\6.4.0\clang-cl_arm64\include\QtCore/qstring.h(704,14): note: candidate function
QString &remove(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive);
^
C:\Qt\6.4.0\clang-cl_arm64\include\QtCore/qstring.h(705,14): note: candidate function
QString &remove(QLatin1StringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive);
Amends 2846bef563
Change-Id: I03bf54e5a6c8d2cbc0c2842399c84bf12ffece56
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -71,7 +71,7 @@ static qint64 extractPID(const QString &output, const QString &packageName)
|
||||
qint64 pid = -1;
|
||||
for (const QString &tuple : output.split('\n')) {
|
||||
// Make sure to remove null characters which might be present in the provided output
|
||||
const QStringList parts = tuple.simplified().remove('\0').split(':');
|
||||
const QStringList parts = tuple.simplified().remove(QChar('\0')).split(':');
|
||||
if (parts.length() == 2 && parts.first() == packageName) {
|
||||
pid = parts.last().toLongLong();
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user