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

Android: Use QList instead of QVector

Browse Source 
Change-Id: If4e163716e8ad5eac782d4b023dcb88fca0f8414
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-23 23:48:38 +02:00
parent 72f82f420a
commit 3fc5551465
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,9 +607,9 @@ FilePath AndroidConfig::keytoolPath() const
return openJDKBinPath().pathAppended(keytoolName).withExecutableSuffix();
}
QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
QList<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
{
QVector<AndroidDeviceInfo> devices;
QList<AndroidDeviceInfo> devices;
Process adbProc;
CommandLine cmd{adbToolPath(), {"devices"}};
adbProc.setCommand(cmd);
@@ -664,7 +664,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(QString *error) const
bool AndroidConfig::isConnected(const QString &serialNumber) const
{
const QVector<AndroidDeviceInfo> devices = connectedDevices();
const QList<AndroidDeviceInfo> devices = connectedDevices();
for (const AndroidDeviceInfo &device : devices) {
if (device.serialNumber == serialNumber)
return true;
@@ -1225,7 +1225,7 @@ void AndroidConfigurations::removeUnusedDebuggers()
return v->type() == Constants::ANDROID_QT_TYPE;
});
QVector<FilePath> uniqueNdks;
QList<FilePath> uniqueNdks;
for (const QtVersion *qt : qtVersions) {
FilePath ndkLocation = androidConfig().ndkLocation(qt);
if (!uniqueNdks.contains(ndkLocation))